summaryrefslogtreecommitdiff
path: root/system/heirloom-pax/sysmacros.patch
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-08-05 01:31:58 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-08-05 01:31:58 +0000
commit8a6e7b726fc93908618526a83d8243365ff3ae46 (patch)
tree90367516eae2c2fb80909b8df2e2aaa06fb6456c /system/heirloom-pax/sysmacros.patch
parent42b5c5b3b14fc62fb14f529035e24f62862a781c (diff)
parentc3a4b6cb60e71fc6eba379e858b846859cd46e9a (diff)
downloadpackages-8a6e7b726fc93908618526a83d8243365ff3ae46.tar.gz
packages-8a6e7b726fc93908618526a83d8243365ff3ae46.tar.bz2
packages-8a6e7b726fc93908618526a83d8243365ff3ae46.tar.xz
packages-8a6e7b726fc93908618526a83d8243365ff3ae46.zip
Merge branch 'arm-fixes' into 'master'
Fixes for issues found on the armv7 builder See merge request adelie/packages!308
Diffstat (limited to 'system/heirloom-pax/sysmacros.patch')
-rw-r--r--system/heirloom-pax/sysmacros.patch14
1 files changed, 14 insertions, 0 deletions
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>