aboutsummaryrefslogtreecommitdiffstats
path: root/testing/spl-grsec
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2014-09-21 18:08:17 +0200
committerCarlo Landmeter <clandmeter@gmail.com>2014-09-21 18:12:05 +0200
commitea9df32c7720f059b7665cd48c5a18c3e4daea1f (patch)
treeab305d8b9133bb1eb3cfed1e3090fa5bbb105ed6 /testing/spl-grsec
parent21bc92831375194c99f36ffa932d1423d9980324 (diff)
downloadaports-ea9df32c7720f059b7665cd48c5a18c3e4daea1f.tar.bz2
aports-ea9df32c7720f059b7665cd48c5a18c3e4daea1f.tar.xz
testing/spl-grsec: simplified musl compat patch
Diffstat (limited to 'testing/spl-grsec')
-rw-r--r--testing/spl-grsec/APKBUILD11
-rw-r--r--testing/spl-grsec/pagesize.patch13
2 files changed, 20 insertions, 4 deletions
diff --git a/testing/spl-grsec/APKBUILD b/testing/spl-grsec/APKBUILD
index 7ccd60509e..eaeab36c75 100644
--- a/testing/spl-grsec/APKBUILD
+++ b/testing/spl-grsec/APKBUILD
@@ -34,7 +34,7 @@ makedepends="$depends_dev perl automake autoconf libtool"
install=""
subpackages="$pkgname-dev $pkgname-utils"
source="http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-$_realver.tar.gz
- "
+ pagesize.patch"
_builddir="$srcdir"/spl-$_realver
@@ -84,6 +84,9 @@ utils() {
"$pkgdir"/lib/ || return 1
}
-md5sums="8df6ce3c8f1d9af6526b36f5079cba59 spl-0.6.3.tar.gz"
-sha256sums="898aa3912c73420a0082375679e28267a26d348a84561e25898a171785f41fe3 spl-0.6.3.tar.gz"
-sha512sums="3a3fecb7bc1944e1b3946593dd8fe22ca70ac79fb2a353664837161b22642817310a54f4fa06e63eedf72dc75a9fbf312fd6c363fd0565d6290d1b8850d83293 spl-0.6.3.tar.gz"
+md5sums="8df6ce3c8f1d9af6526b36f5079cba59 spl-0.6.3.tar.gz
+fdfbb0fb55c9f6d79380cf8084f0999b pagesize.patch"
+sha256sums="898aa3912c73420a0082375679e28267a26d348a84561e25898a171785f41fe3 spl-0.6.3.tar.gz
+92219a1e52d5b1d8322f98c459ec267bbaae013c9f9565dda2e0b14829a30fbf pagesize.patch"
+sha512sums="3a3fecb7bc1944e1b3946593dd8fe22ca70ac79fb2a353664837161b22642817310a54f4fa06e63eedf72dc75a9fbf312fd6c363fd0565d6290d1b8850d83293 spl-0.6.3.tar.gz
+132411326e4b9763c65519dc6a6b24d9353c126e37e87a443a4e51030d5593e52a1230d6e03a81f4b2ad67d5919e21f9869e8635fc5f4f612f5ae93c121c5f7f pagesize.patch"
diff --git a/testing/spl-grsec/pagesize.patch b/testing/spl-grsec/pagesize.patch
new file mode 100644
index 0000000000..825ec31f40
--- /dev/null
+++ b/testing/spl-grsec/pagesize.patch
@@ -0,0 +1,13 @@
+diff -urw src/spl-master/include/sys/sysmacros.h spl-master/include/sys/sysmacros.h
+--- src/spl-master/include/sys/sysmacros.h 2014-06-06 17:04:01.416666671 +0000
++++ spl-master/include/sys/sysmacros.h 2014-06-06 17:02:23.586666828 +0000
+@@ -104,7 +104,9 @@
+
+ /* Missing macros
+ */
++#ifndef PAGESIZE
+ #define PAGESIZE PAGE_SIZE
++#endif
+
+ /* from Solaris sys/byteorder.h */
+ #define BSWAP_8(x) ((x) & 0xff)