Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(main/oleo): fix building with ./build-all.sh in docker. #22026

Merged
merged 1 commit into from
Oct 31, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions packages/oleo/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/oleo/
TERMUX_PKG_DESCRIPTION="The GNU Spreadsheet"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.99.16
TERMUX_PKG_REVISION=8
TERMUX_PKG_VERSION="1.99.16"
TERMUX_PKG_REVISION=9
TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/oleo/oleo-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=6598df85d06ff2534ec08ed0657508f17dbbc58dd02d419160989de7c487bc86
TERMUX_PKG_DEPENDS="ncurses"
Expand All @@ -15,5 +15,13 @@ Oleo/*
share/oleo/oleo.html"

termux_step_pre_configure() {
# configure script tries to build program which writes `sizeof` expression
# result with our toolchain and tries to execute it which is impossible
# with cross-compiling inside docker.
export ac_cv_sizeof_short=__SIZEOF_SHORT__
export ac_cv_sizeof_int=__SIZEOF_INT__
export ac_cv_sizeof_long=__SIZEOF_LONG__
export ac_cv_header_stdc=yes

export CFLAGS+=" -fcommon"
}