diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-19 13:33:20 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-19 13:34:41 +0000 |
| commit | e47b327a5cca7fc6a3ed1b67ebac4fa652b51042 (patch) | |
| tree | 957bbdb842bb6997e283f9feff981b54765987d2 | |
| parent | 53c97fb0323349d9930cecfd40120f7e1b3f3223 (diff) | |
| download | aports-e47b327a5cca7fc6a3ed1b67ebac4fa652b51042.tar.bz2 aports-e47b327a5cca7fc6a3ed1b67ebac4fa652b51042.tar.xz | |
community/sigar: enable on aarch64
fixes #7011
| -rw-r--r-- | community/sigar/APKBUILD | 16 | ||||
| -rw-r--r-- | community/sigar/fix-aarch64.patch | 16 |
2 files changed, 21 insertions, 11 deletions
diff --git a/community/sigar/APKBUILD b/community/sigar/APKBUILD index 2fd6d57f86..095b01e521 100644 --- a/community/sigar/APKBUILD +++ b/community/sigar/APKBUILD @@ -1,10 +1,10 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sigar pkgver=1.6.4 -pkgrel=0 +pkgrel=1 pkgdesc="System Information Gatherer And Reporter" url="http://sigar.hyperic.com/" -arch="x86_64 x86 ppc64le" +arch="x86_64 x86 ppc64le aarch64" license="Apache-2.0" depends="" depends_dev="" @@ -15,6 +15,7 @@ source="https://github.com/hyperic/sigar/archive/sigar-$pkgver.tar.gz 0001-fix-compilation-with-musl-libc.patch 0002-only-enable-the-GNU-libc-strerror_r-on-GNU-libc.patch 0003-build-with-libtirpc-and-gcc5.patch + fix-aarch64.patch " builddir="$srcdir"/sigar-sigar-$pkgver @@ -29,15 +30,8 @@ package() { install ./sigar-bin/lib/libsigar-*.so "$pkgdir"/usr/lib/ } -md5sums="b4a5e195755fa084feec3cdadcd964d1 sigar-1.6.4.tar.gz -6e519321a995126f66995d5d961b5463 0001-fix-compilation-with-musl-libc.patch -9c739f71c0f9bd0cba16e7d85fc49271 0002-only-enable-the-GNU-libc-strerror_r-on-GNU-libc.patch -ec4b6b987330d01fdfa94f7f3e62c8f6 0003-build-with-libtirpc-and-gcc5.patch" -sha256sums="179b04c1eb7e10e50632e1f8c8d25c1bc4d35259f2976bc72686ecfa79a0052e sigar-1.6.4.tar.gz -be24452bf5960adbe6d7b422ca101d015d52ac0dfabcf0ca973883cab56b6d18 0001-fix-compilation-with-musl-libc.patch -234551e9b9dd03345bacd589c3b9e66f90d6730db9ddca4d692cf8d779c83009 0002-only-enable-the-GNU-libc-strerror_r-on-GNU-libc.patch -8d68f10a9a14c54c17276e7d48fb6cf82919ad473f2fdf475cfcab6ca9678a96 0003-build-with-libtirpc-and-gcc5.patch" sha512sums="0515f3501a51357d6ac01dc5e3ecffae10995f347b98c66928adff247b86e52112d2bf9cf78b2633941eb9c7fb23f019f4885c41348fe461239e4eebd147253e sigar-1.6.4.tar.gz 577f10add8dfe3f1e97375aba06fdecb4ae9d64d75246107cde2183a9efee5eeb8f2c00c072397e2ac4bba2dc49e67c5efef141c609f84a6128d03f3f5187d05 0001-fix-compilation-with-musl-libc.patch 12f68a3c3449b98a45458aa189a633d32ccc9adab83e04e84c8e496c1e0545a58ecc86fdcb68d55b162f5717244f69a48f0a13241b672c909993dc13643c8c64 0002-only-enable-the-GNU-libc-strerror_r-on-GNU-libc.patch -1896f8deb1945dd18283cb391528791b7554b2a4d56c0bc02a58d36a6af2a333782486a508e4d756b558d522d9a759bb3eefe12f0fd1720a9b83426d2b9bf469 0003-build-with-libtirpc-and-gcc5.patch" +1896f8deb1945dd18283cb391528791b7554b2a4d56c0bc02a58d36a6af2a333782486a508e4d756b558d522d9a759bb3eefe12f0fd1720a9b83426d2b9bf469 0003-build-with-libtirpc-and-gcc5.patch +e178aa27634fa13784af17fc7af66091b7f1cd51fb54ff2e004755004c7d53e48e08db9982b7c2eec96d0f662bbf32a07346c103f3b31bd5a3e72ef8d8bf44bf fix-aarch64.patch" diff --git a/community/sigar/fix-aarch64.patch b/community/sigar/fix-aarch64.patch new file mode 100644 index 0000000000..408dd22e49 --- /dev/null +++ b/community/sigar/fix-aarch64.patch @@ -0,0 +1,16 @@ +diff --git a/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java b/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java +index df3e0fa..cd10b68 100644 +--- a/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java ++++ b/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java +@@ -74,11 +74,6 @@ public class ArchNameTask extends Task { + + if (ArchName.is64()) { + getProject().setProperty("jni.arch64", "true"); +- if (ArchLoader.IS_LINUX) { +- if (!osArch.equals("ia64")) { +- getProject().setProperty("jni.gccm", "-m64"); +- } +- } + } + else { + if (ArchLoader.IS_LINUX && osArch.equals("s390")) { |