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.

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

Jump to bottom

suitesparse: bump to 7.8.3 #1279

Merged
merged 3 commits into from
Oct 27, 2024
Merged

suitesparse: bump to 7.8.3 #1279

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
5ddff3e
suitesparse: bump to 7.8.3
licy183 Oct 25, 2024
5970d2d
sundials: revbump to rebuild
licy183 Oct 25, 2024
9d17459
octave{,-x}: bump to 9.2.0
licy183 Oct 26, 2024
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
25 changes: 21 additions & 4 deletions tur/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
@@ -1,6 +1,23 @@
--- a/liboctave/system/oct-password.cc
+++ b/liboctave/system/oct-password.cc
@@ -31,6 +31,15 @@
--- a/liboctave/wrappers/pwd-wrappers.h
+++ b/liboctave/wrappers/pwd-wrappers.h
@@ -43,7 +43,14 @@
char *pw_passwd;
uid_t pw_uid;
gid_t pw_gid;
+#if defined(__ANDROID__) && !defined(__LP64__)
+#if !defined(pw_gecos)
+/* Note: On LP32, we define pw_gecos to pw_passwd since they're both NULL. */
+# define pw_gecos pw_passwd
+#endif
+#else
char *pw_gecos;
+#endif
char *pw_dir;
char *pw_shell;
};
--- a/liboctave/wrappers/pwd-wrappers.c
+++ b/liboctave/wrappers/pwd-wrappers.c
@@ -32,6 +32,15 @@

#if defined (HAVE_PWD_H)
# include <pwd.h>
Expand All @@ -15,4 +32,4 @@
+# endif
#endif

#include "lo-error.h"
#include "pwd-wrappers.h"
20 changes: 6 additions & 14 deletions tur/octave-x/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,17 @@ TERMUX_PKG_HOMEPAGE=https://octave.org
TERMUX_PKG_DESCRIPTION="GNU Octave is a high-level language, primarily intended for numerical computations. (with X11 support)"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux-user-repository"
TERMUX_PKG_VERSION=1:8.4.0
TERMUX_PKG_REVISION=5
TERMUX_PKG_VERSION=1:9.2.0
TERMUX_PKG_SRCURL=https://ftpmirror.gnu.org/octave/octave-${TERMUX_PKG_VERSION#*:}.tar.xz
TERMUX_PKG_SHA256=6f9ad73a3ee4291b6341d6c0f5e5c85d6e0310376e4991b959a6d340b3ffa8a8
TERMUX_PKG_DEPENDS="arpack-ng, bzip2, fftw, fltk, fontconfig, freetype, glpk, glu, graphicsmagick, libcurl, libhdf5, libiconv, libopenblas, libsndfile, opengl, openssl, pcre2, portaudio, qhull, qrupdate-ng, rapidjson, readline, suitesparse, sundials, zlib"
TERMUX_PKG_BUILD_DEPENDS="gnuplot, less"

# Qt-GUI cannot be enabled, because `qcollectiongenerator` and
# `qhelpgenerator` is not exist at host.
#TERMUX_PKG_DEPENDS="zlib, bzip2, openssl, libiconv, pcre, readline, libcurl, libhdf5, qhull, rapidjson, fftw, glpk, libopenblas, arpack-ng, qrupdate-ng, suitesparse, sundials, fontconfig, freetype, graphicsmagick, libsndfile, portaudio, fltk, mesa, glu, qt5-qtbase, qt5-qttools, qscintilla""
#TERMUX_PKG_BUILD_DEPENDS="gnuplot, less, qt5-qtbase-cross-tools, qt5-qttools-cross-tools"

TERMUX_PKG_SHA256=21417afb579105b035cac0bea09201522e384893ae90a781b8727efa32765807
TERMUX_PKG_DEPENDS="arpack-ng, bzip2, fftw, fltk, fontconfig, freetype, glpk, glu, graphicsmagick, libcurl, libhdf5, libiconv, libopenblas, libsndfile, opengl, openssl, pcre2, portaudio, qhull, qrupdate-ng, qt6-qtbase, qt6-qttools, qt6-qt5compat, rapidjson, readline, suitesparse, sundials, zlib"
TERMUX_PKG_BUILD_DEPENDS="gnuplot, less, qt6-qtbase-cross-tools, qt6-qttools-cross-tools"
TERMUX_PKG_RECOMMENDS="gnuplot, less"
TERMUX_PKG_CONFLICTS="octave"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--with-x
--with-qt=6
--enable-link-all-dependencies
--disable-openmp
--with-blas=openblas
Expand Down Expand Up @@ -78,7 +72,5 @@ termux_step_pre_configure() {
done
export PATH="$TERMUX_PKG_TMPDIR/_fake_bin:$PATH"

## This is to allow the build script find the `moc` on cross-build host
# for Qt-GUI
#export PATH+=":${TERMUX_PREFIX}/opt/qt/cross/bin"
export PATH="$TERMUX_PREFIX/opt/qt6/cross/bin:$PATH"
}
25 changes: 21 additions & 4 deletions tur/octave/0003-undefine-the-macro-in-pwd.h.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
--- a/liboctave/system/oct-password.cc
+++ b/liboctave/system/oct-password.cc
@@ -31,6 +31,15 @@
--- a/liboctave/wrappers/pwd-wrappers.h
+++ b/liboctave/wrappers/pwd-wrappers.h
@@ -43,7 +43,14 @@
char *pw_passwd;
uid_t pw_uid;
gid_t pw_gid;
+#if defined(__ANDROID__) && !defined(__LP64__)
+#if !defined(pw_gecos)
+/* Note: On LP32, we define pw_gecos to pw_passwd since they're both NULL. */
+# define pw_gecos pw_passwd
+#endif
+#else
char *pw_gecos;
+#endif
char *pw_dir;
char *pw_shell;
};
--- a/liboctave/wrappers/pwd-wrappers.c
+++ b/liboctave/wrappers/pwd-wrappers.c
@@ -32,6 +32,15 @@

#if defined (HAVE_PWD_H)
# include <pwd.h>
Expand All @@ -15,4 +32,4 @@
+# endif
#endif

#include "lo-error.h"
#include "pwd-wrappers.h"
5 changes: 2 additions & 3 deletions tur/octave/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://octave.org
TERMUX_PKG_DESCRIPTION="GNU Octave is a high-level language, primarily intended for numerical computations. (only CLI)"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux-user-repository"
TERMUX_PKG_VERSION=1:8.4.0
TERMUX_PKG_REVISION=5
TERMUX_PKG_VERSION=1:9.2.0
TERMUX_PKG_SRCURL=https://ftpmirror.gnu.org/octave/octave-${TERMUX_PKG_VERSION#*:}.tar.xz
TERMUX_PKG_SHA256=6f9ad73a3ee4291b6341d6c0f5e5c85d6e0310376e4991b959a6d340b3ffa8a8
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_BUILD_DEPENDS="gnuplot, less"
TERMUX_PKG_RECOMMENDS="gnuplot, less"
Expand Down
6 changes: 3 additions & 3 deletions tur/suitesparse/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/DrTimothyAldenDavis/SuiteSparse
TERMUX_PKG_DESCRIPTION="A Suite of Sparse matrix packages."
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux-user-repository"
TERMUX_PKG_VERSION="1:7.8.2"
TERMUX_PKG_VERSION="1:7.8.3"
TERMUX_PKG_SRCURL=https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${TERMUX_PKG_VERSION#*:}.tar.gz
TERMUX_PKG_SHA256=996c48c87baaeb5fc04bd85c7e66d3651a56fe749c531c60926d75b4db5d2181
TERMUX_PKG_SHA256=ce39b28d4038a09c14f21e02c664401be73c0cb96a9198418d6a98a7db73a259
TERMUX_PKG_DEPENDS="libandroid-complex-math, blas-openblas, libopenblas, libgmp, libmpfr"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_FORCE_CMAKE=true
Expand Down Expand Up @@ -95,7 +95,7 @@ lib/libklu_cholmod.so.2
lib/liblagraph.so.1
lib/liblagraphx.so.1
lib/libldl.so.3
lib/libparu.so.0
lib/libparu.so.1
lib/librbio.so.4
lib/libspex.so.3
lib/libspexpython.so.3
Expand Down
1 change: 1 addition & 0 deletions tur/sundials/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="SUite of Nonlinear and DIfferential/ALgebraic equation S
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux-user-repository"
TERMUX_PKG_VERSION="1:7.1.1"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/LLNL/sundials/releases/download/v${TERMUX_PKG_VERSION#*:}/sundials-${TERMUX_PKG_VERSION#*:}.tar.gz
TERMUX_PKG_SHA256=ea7d6edfb52448ddfdc1ec48f89a721fe6c0a259c10f8ef56f60fcded87a94bb
TERMUX_PKG_DEPENDS="libopenblas, suitesparse"
Expand Down
Loading