summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2019-08-05 01:18:51 +0000
committerSamuel Holland <samuel@sholland.org>2019-08-05 01:18:51 +0000
commit484f778d507f36038efd370f4c4832900dc7faa8 (patch)
tree9475752ccc1112be795d9600be126942a45a2eb5 /system
parent6f02c28c6bb7366615dd989bddb25234e12332c1 (diff)
downloadpackages-484f778d507f36038efd370f4c4832900dc7faa8.tar.gz
packages-484f778d507f36038efd370f4c4832900dc7faa8.tar.bz2
packages-484f778d507f36038efd370f4c4832900dc7faa8.tar.xz
packages-484f778d507f36038efd370f4c4832900dc7faa8.zip
system/heirloom-pax: Fix build for major/minor move
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'system')
-rw-r--r--system/heirloom-pax/APKBUILD6
-rw-r--r--system/heirloom-pax/sysmacros.patch14
2 files changed, 18 insertions, 2 deletions
diff --git a/system/heirloom-pax/APKBUILD b/system/heirloom-pax/APKBUILD
index af918e06f..7b91e0235 100644
--- a/system/heirloom-pax/APKBUILD
+++ b/system/heirloom-pax/APKBUILD
@@ -12,7 +12,8 @@ depends=""
makedepends="bsd-compat-headers bzip2-dev zlib-dev"
replaces="pax"
subpackages="$pkgname-doc"
-source="https://distfiles.adelielinux.org/source/${pkgname}-$pkgver.tar.xz"
+source="https://distfiles.adelielinux.org/source/${pkgname}-$pkgver.tar.xz
+ sysmacros.patch"
build() {
cd "$builddir"
@@ -31,4 +32,5 @@ package() {
mv "$pkgdir"/usr/bin/cpio "$pkgdir"/usr/5bin/cpio
}
-sha512sums="7b0ad20cc51b5bcec9c07e84c603e4891f636944f6f6bd13d3decb0e9d6b23d6164b663468ee2293b37721aae20334774f4e56fd8541ffceee934050e819b642 heirloom-pax-1.0.tar.xz"
+sha512sums="7b0ad20cc51b5bcec9c07e84c603e4891f636944f6f6bd13d3decb0e9d6b23d6164b663468ee2293b37721aae20334774f4e56fd8541ffceee934050e819b642 heirloom-pax-1.0.tar.xz
+bcc12138ebed707e165a1ac5dac815acd85770974e19f62610e0fe32a96879fb1173fc4e7beafde12b7bc1ed03f2751b2839eeb3ccacbe209d8cbcfe0307eac3 sysmacros.patch"
diff --git a/system/heirloom-pax/sysmacros.patch b/system/heirloom-pax/sysmacros.patch
new file mode 100644
index 000000000..3a4feb996
--- /dev/null
+++ b/system/heirloom-pax/sysmacros.patch
@@ -0,0 +1,14 @@
+--- heirloom-pax-1.0/cpio/cpio.c
++++ heirloom-pax-1.0/cpio/cpio.c
+@@ -91,9 +91,9 @@
+ #include <sfile.h>
+ #include <atoll.h>
+
+-#ifdef _AIX
++#ifndef major
+ #include <sys/sysmacros.h>
+-#endif /* _AIX */
++#endif /* !major */
+
+ #ifndef major
+ #include <sys/mkdev.h>