aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--community/octave/APKBUILD (renamed from testing/octave/APKBUILD)35
-rw-r--r--community/octave/abs.patch (renamed from testing/octave/abs.patch)0
-rw-r--r--community/octave/libinterp-deps.patch (renamed from testing/octave/libinterp-deps.patch)0
3 files changed, 24 insertions, 11 deletions
diff --git a/testing/octave/APKBUILD b/community/octave/APKBUILD
index 139efb05e2..e576def827 100644
--- a/testing/octave/APKBUILD
+++ b/community/octave/APKBUILD
@@ -1,18 +1,32 @@
+# Contributor: Duncan Bellamy <dunk@denkimushi.com>
# Contributor: Daniel Sabogal <dsabogalcc@gmail.com>
-# Maintainer:
+# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
pkgname=octave
-pkgver=6.1.0
-pkgrel=3
+pkgver=6.2.0
+pkgrel=0
pkgdesc="A high-level language, primarily intended for numerical computations"
url="https://www.gnu.org/software/octave/"
-# x86: missing tex dependencies
# mips: missing openblas
-# armv7, armhf, x86: missing openjdk11
-arch="all !x86 !armv7 !ppc64le !mips !mips64 !s390x !armhf"
+# s390x missing texlive
+arch="all !s390x !mips !mips64"
license="GPL-3.0-or-later"
subpackages="$pkgname-doc"
-_jdkver=11
-_jhome=/usr/lib/jvm/java-"$_jdkver"-openjdk
+
+if [ "$CARCH" == "x86" ]
+then
+ #x86 libjava.so cannot find libjvm.so
+ options="!check"
+fi
+
+#openjdk8 needed for 32bit support
+case "$CARCH" in
+ x86|armv7|armhf)
+ _jdkver=8 ;;
+ *)
+ _jdkver=11 ;;
+esac
+
+_jhome=/usr/lib/jvm/java-1."$_jdkver"-openjdk
makedepends="arpack-dev
autoconf
automake
@@ -63,7 +77,6 @@ source="https://ftpmirror.gnu.org/octave/octave-$pkgver.tar.gz
prepare() {
default_prepare
-
autoreconf -vif
}
@@ -84,7 +97,7 @@ build() {
}
check() {
- make LD_LIBRARY_PATH=$_jhome/lib/server check
+ make check
}
package() {
@@ -94,6 +107,6 @@ package() {
rm -rf "$pkgdir"/usr/share/octave/"$pkgver"/etc/tests
}
-sha512sums="34abe6fa489aea94bfeb08027653cd83a73611c6032c8b3ddc4b59223f316ee275f74490048a45aebf178858494f6920593565e612f6e77351102494cb9f49f7 octave-6.1.0.tar.gz
+sha512sums="4039b68ffa77e599c63aa5748411603e86943be63ce96b6810547ba9776fe400939957fd8c40b2f212dfe244c76e58fdbbc4025179c9785b773da9bbb9fedaf2 octave-6.2.0.tar.gz
f449d84ec0b9e18919473d9efc5b6628dc9eb62bbb4fe8160ef9c280546b7b2f07ea803992240063685ec4e8519b80002c752647060fc438e6dce8d464b98b6d libinterp-deps.patch
f6cd1a52686a66d9914029b3c70eba88d2468700abfb16c3bdc5c0bae2a29cbf06143e15c2828be1112d45403247ff5713edf1b1261eaf132465ac05df6c7c7c abs.patch"
diff --git a/testing/octave/abs.patch b/community/octave/abs.patch
index 4dab61fd9b..4dab61fd9b 100644
--- a/testing/octave/abs.patch
+++ b/community/octave/abs.patch
diff --git a/testing/octave/libinterp-deps.patch b/community/octave/libinterp-deps.patch
index 9c2e84ecd9..9c2e84ecd9 100644
--- a/testing/octave/libinterp-deps.patch
+++ b/community/octave/libinterp-deps.patch