这是indexloc提供的服务，不要输入任何密码
Skip to content

fix(toolchain/{23c,27c}): add -isystem${TERMUX_PREFIX}/include/c++/v1 to $CPPFLAGS before -isystem${TERMUX_PREFIX}/include #23579

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Mar 8, 2025
Merged

fix(toolchain/{23c,27c}): add -isystem${TERMUX_PREFIX}/include/c++/v1 to $CPPFLAGS before -isystem${TERMUX_PREFIX}/include #23579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
785d525
fix(toolchain/{23c,27c}): add -isystem${TERMUX_PREFIX}/include/c++/v1…
robertkirkman Mar 7, 2025
1240630
fix(main/ghostscript): clean up `$CPPFLAGS` and add tested `$TERMUX_O…
robertkirkman Mar 7, 2025
302f7f0
fix({main/octave,x11/octave-x}): revbump and fix propagated $CPPFLAGS
robertkirkman Mar 7, 2025
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
7 changes: 5 additions & 2 deletions packages/ghostscript/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Interpreter for the PostScript language and for PDF"
TERMUX_PKG_LICENSE="AGPL-V3"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="10.03.1"
TERMUX_PKG_REVISION=2
TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${TERMUX_PKG_VERSION//.}/ghostpdl-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=8ea9dd8768b64576bc4ee2d79611450c9e1edeb686f7824f3bf94b92457b882a
TERMUX_PKG_AUTO_UPDATE=false
Expand All @@ -29,7 +29,10 @@ termux_step_post_get_source() {
}

termux_step_pre_configure() {
CPPFLAGS+=" -I${TERMUX_STANDALONE_TOOLCHAIN}/sysroot/usr/include/c++/v1"
if [ "$TERMUX_ON_DEVICE_BUILD" = "true" ]; then
export PKGCONFIG="$PKG_CONFIG"
export LDFLAGS+=" -liconv"
fi

if [[ "${TERMUX_ARCH}" == "aarch64" ]]; then
# https://github.com/llvm/llvm-project/issues/74361
Expand Down
15 changes: 11 additions & 4 deletions packages/octave/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="GNU Octave is a high-level language, primarily intended
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="9.4.0"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://ftpmirror.gnu.org/octave/octave-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=fff911909ef79f95ba244dab5b8c1cb8c693a6c447d31deabb53994f17cb7b3d
TERMUX_PKG_DEPENDS="libandroid-complex-math, arpack-ng, bzip2, fftw, fontconfig, freetype, glpk, graphicsmagick, libcurl, libhdf5, libiconv, libopenblas, libsndfile, openssl, pcre2, portaudio, qhull, qrupdate-ng, rapidjson, readline, suitesparse, sundials, zlib"
TERMUX_PKG_DEPENDS="libandroid-complex-math, arpack-ng, clang, bzip2, fftw, fontconfig, freetype, glpk, graphicsmagick, libcurl, libhdf5, libiconv, libopenblas, libsndfile, make, openssl, pcre2, portaudio, qhull, qrupdate-ng, rapidjson, readline, suitesparse, sundials, zlib"
TERMUX_PKG_BUILD_DEPENDS="gnuplot, less"
TERMUX_PKG_RECOMMENDS="gnuplot, less"
TERMUX_PKG_CONFLICTS="octave-x"
Expand Down Expand Up @@ -52,9 +53,15 @@ termux_step_pre_configure() {
local flang_libs_dir="$flang_toolchain_dir/sysroot/usr/lib/$TERMUX_HOST_PLATFORM"

export F77="$FC"
export ac_cv_f77_libs=" $flang_libs_dir/libFortranRuntime.a $flang_libs_dir/libFortranDecimal.a"
mkdir -p $TERMUX_PKG_TMPDIR/_deps
ln -sf $flang_libs_dir/libFortranRuntime.a $TERMUX_PKG_TMPDIR/_deps/
ln -sf $flang_libs_dir/libFortranDecimal.a $TERMUX_PKG_TMPDIR/_deps/
export ac_cv_f77_libs="-L$TERMUX_PKG_TMPDIR/_deps -l:libFortranRuntime.a -l:libFortranDecimal.a"

LDFLAGS+=" -Wl,-rpath,$TERMUX_PREFIX/lib/octave/$TERMUX_PKG_VERSION"
LDFLAGS+=" $($CC -print-libgcc-file-name)"
export LIBS="-landroid-complex-math"
local _libgcc_file="$($CC -print-libgcc-file-name)"
local _libgcc_path="$(dirname $_libgcc_file)"
local _libgcc_name="$(basename $_libgcc_file)"
# put -l:$_libgcc_name only in $LIBS instead of $LDFLAGS
export LIBS="-landroid-complex-math -L$_libgcc_path -l:$_libgcc_name"
}
4 changes: 3 additions & 1 deletion scripts/build/toolchain/termux_setup_toolchain_23c.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ termux_setup_toolchain_23c() {
fi

export CXXFLAGS="$CFLAGS"
export CPPFLAGS+=" -isystem${TERMUX_PREFIX}/include"
# set the proper header include order - first package includes, then prefix includes
# -isystem${TERMUX_PREFIX}/include/c++/v1 is needed here for on-device building to work correctly
export CPPFLAGS+=" -isystem${TERMUX_PREFIX}/include/c++/v1 -isystem${TERMUX_PREFIX}/include"

# If libandroid-support is declared as a dependency, link to it explicitly:
if [ "$TERMUX_PKG_DEPENDS" != "${TERMUX_PKG_DEPENDS/libandroid-support/}" ]; then
Expand Down
4 changes: 3 additions & 1 deletion scripts/build/toolchain/termux_setup_toolchain_27c.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ termux_setup_toolchain_27c() {
fi

export CXXFLAGS="$CFLAGS"
export CPPFLAGS+=" -isystem${TERMUX_PREFIX}/include"
# set the proper header include order - first package includes, then prefix includes
# -isystem${TERMUX_PREFIX}/include/c++/v1 is needed here for on-device building to work correctly
export CPPFLAGS+=" -isystem${TERMUX_PREFIX}/include/c++/v1 -isystem${TERMUX_PREFIX}/include"

# If libandroid-support is declared as a dependency, link to it explicitly:
if [ "$TERMUX_PKG_DEPENDS" != "${TERMUX_PKG_DEPENDS/libandroid-support/}" ]; then
Expand Down
44 changes: 0 additions & 44 deletions x11-packages/octave-x/0001-fix-hardcoded-paths.patch
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions x11-packages/octave-x/0001-fix-hardcoded-paths.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../packages/octave/0001-fix-hardcoded-paths.patch
20 changes: 0 additions & 20 deletions x11-packages/octave-x/0002-append-rpath-flag-to-pkg-config-files.patch
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions x11-packages/octave-x/0002-append-rpath-flag-to-pkg-config-files.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../packages/octave/0002-append-rpath-flag-to-pkg-config-files.patch
17 changes: 0 additions & 17 deletions x11-packages/octave-x/0003-undefine-the-macro-in-pwd.h.patch
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions x11-packages/octave-x/0003-undefine-the-macro-in-pwd.h.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../packages/octave/0003-undefine-the-macro-in-pwd.h.patch
13 changes: 8 additions & 5 deletions x11-packages/octave-x/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="GNU Octave is a high-level language, primarily intended
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="9.4.0"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://ftpmirror.gnu.org/octave/octave-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=fff911909ef79f95ba244dab5b8c1cb8c693a6c447d31deabb53994f17cb7b3d
TERMUX_PKG_DEPENDS="arpack-ng, fftw, fltk, fontconfig, freetype, glpk, glu, graphicsmagick, libandroid-complex-math, libbz2, libc++, libcurl, libhdf5, libiconv, libopenblas, libsndfile, libx11, libxcursor, libxext, libxfixes, libxft, libxinerama, libxrender, opengl, openssl, pcre2, portaudio, qhull, qrupdate-ng, qt6-qt5compat, qt6-qtbase, qt6-qttools, readline, suitesparse, sundials, zlib"
TERMUX_PKG_DEPENDS="arpack-ng, clang, fftw, fltk, fontconfig, freetype, glpk, glu, graphicsmagick, libandroid-complex-math, libbz2, libc++, libcurl, libhdf5, libiconv, libopenblas, libsndfile, libx11, libxcursor, libxext, libxfixes, libxft, libxinerama, libxrender, make, opengl, openssl, pcre2, portaudio, qhull, qrupdate-ng, qt6-qt5compat, qt6-qtbase, qt6-qttools, readline, suitesparse, sundials, zlib"
TERMUX_PKG_BUILD_DEPENDS="gnuplot, less, rapidjson, qt6-qtbase-cross-tools, qt6-qttools-cross-tools"
TERMUX_PKG_RECOMMENDS="gnuplot, less"
TERMUX_PKG_CONFLICTS="octave-x"
Expand Down Expand Up @@ -53,15 +54,17 @@ termux_step_pre_configure() {
local flang_libs_dir="$flang_toolchain_dir/sysroot/usr/lib/$TERMUX_HOST_PLATFORM"

export F77="$FC"
export ac_cv_f77_libs=" $flang_libs_dir/libFortranRuntime.a $flang_libs_dir/libFortranDecimal.a"
mkdir -p $TERMUX_PKG_TMPDIR/_deps
ln -sf $flang_libs_dir/libFortranRuntime.a $TERMUX_PKG_TMPDIR/_deps/
ln -sf $flang_libs_dir/libFortranDecimal.a $TERMUX_PKG_TMPDIR/_deps/
export ac_cv_f77_libs="-L$TERMUX_PKG_TMPDIR/_deps -l:libFortranRuntime.a -l:libFortranDecimal.a"

LDFLAGS+=" -Wl,-rpath,$TERMUX_PREFIX/lib/octave/$TERMUX_PKG_VERSION"

local _libgcc_file="$($CC -print-libgcc-file-name)"
local _libgcc_path="$(dirname $_libgcc_file)"
local _libgcc_name="$(basename $_libgcc_file)"
LDFLAGS+=" -L$_libgcc_path -l:$_libgcc_name"
export LIBS="-landroid-complex-math"
# put -l:$_libgcc_name only in $LIBS instead of $LDFLAGS
export LIBS="-landroid-complex-math -L$_libgcc_path -l:$_libgcc_name"

export PATH="$TERMUX_PREFIX/opt/qt6/cross/bin:$PATH"
}