revbump({main,x11}/octave{,-x}): link against libandroid-complex-math

termux · Oct 23, 2024 · 189a3eb · 189a3eb
1 parent 0481f38
commit 189a3eb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 50 deletions.
diff --git a/packages/octave/build.sh b/packages/octave/build.sh
@@ -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.2.0"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://ftpmirror.gnu.org/octave/octave-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=21417afb579105b035cac0bea09201522e384893ae90a781b8727efa32765807
-TERMUX_PKG_DEPENDS="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, bzip2, fftw, fontconfig, freetype, glpk, graphicsmagick, libcurl, libhdf5, libiconv, libopenblas, libsndfile, 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"
@@ -47,9 +48,6 @@ termux_step_post_get_source() {
 
 termux_step_pre_configure() {
 	termux_setup_flang
-
-	$CC "$TERMUX_PKG_BUILDER_DIR/clogf.c" -o "$TERMUX_PKG_BUILDDIR/clogf.o" -c
-	ar rcu "$TERMUX_PKG_BUILDDIR/clogf.a" "$TERMUX_PKG_BUILDDIR/clogf.o"
 
 	local flang_toolchain_dir="$(dirname $(dirname $(command -v flang-new)))"
 	local flang_libs_dir="$flang_toolchain_dir/sysroot/usr/lib/$TERMUX_HOST_PLATFORM"
@@ -59,5 +57,5 @@ termux_step_pre_configure() {
 
 	LDFLAGS+=" -Wl,-rpath,$TERMUX_PREFIX/lib/octave/$TERMUX_PKG_VERSION"
 	LDFLAGS+=" $($CC -print-libgcc-file-name)"
-	export LIBS="$TERMUX_PKG_BUILDDIR/clogf.a"
+	export LIBS="-landroid-complex-math"
 }
diff --git a/packages/octave/clogf.c b/packages/octave/clogf.c
diff --git a/x11-packages/octave-x/build.sh b/x11-packages/octave-x/build.sh
@@ -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.2.0"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://ftpmirror.gnu.org/octave/octave-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=21417afb579105b035cac0bea09201522e384893ae90a781b8727efa32765807
-TERMUX_PKG_DEPENDS="arpack-ng, bzip2, fftw, fltk, fontconfig, freetype, glpk, glu, graphicsmagick, libcurl, libhdf5, libiconv, libopenblas, libsndfile, opengl, openssl, pcre, portaudio, qhull, qrupdate-ng, rapidjson, readline, suitesparse, sundials, zlib"
+TERMUX_PKG_DEPENDS="libandroid-complex-math, arpack-ng, bzip2, fftw, fltk, fontconfig, freetype, glpk, glu, graphicsmagick, libcurl, libhdf5, libiconv, libopenblas, libsndfile, opengl, openssl, pcre, 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"
@@ -48,9 +49,6 @@ termux_step_post_get_source() {
 
 termux_step_pre_configure() {
 	termux_setup_flang
-
-	$CC "$TERMUX_PKG_BUILDER_DIR/clogf.c" -o "$TERMUX_PKG_BUILDDIR/clogf.o" -c
-	ar rcu "$TERMUX_PKG_BUILDDIR/clogf.a" "$TERMUX_PKG_BUILDDIR/clogf.o"
 
 	local flang_toolchain_dir="$(dirname $(dirname $(command -v flang-new)))"
 	local flang_libs_dir="$flang_toolchain_dir/sysroot/usr/lib/$TERMUX_HOST_PLATFORM"
@@ -60,5 +58,5 @@ termux_step_pre_configure() {
 
 	LDFLAGS+=" -Wl,-rpath,$TERMUX_PREFIX/lib/octave/$TERMUX_PKG_VERSION"
 	LDFLAGS+=" $($CC -print-libgcc-file-name)"
-	export LIBS="$TERMUX_PKG_BUILDDIR/clogf.a"
+	export LIBS="-landroid-complex-math"
 }
diff --git a/x11-packages/octave-x/clogf.c b/x11-packages/octave-x/clogf.c