summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authortriaxx <triaxx@pkgsrc.org>2018-10-29 20:18:02 +0000
committertriaxx <triaxx@pkgsrc.org>2018-10-29 20:18:02 +0000
commit29bcae9a72373da1f13f7cb478599f36db56ff0a (patch)
tree1dd4c0b19cd41e8415f15fa8d17dab51dee923e6 /archivers
parent013798c571bf1aaad435448956e085143d9b3cf7 (diff)
downloadpkgsrc-29bcae9a72373da1f13f7cb478599f36db56ff0a.tar.gz
pax: add <sys/sysmacros.h> for Linux
* On Arch Linux, the build failed, makedev(3) indicates #include <sys/sysmacros.h> * On Debian Buster, the build succeed but a big warning is displayed: warning: In the GNU C Library, "minor" is defined by <sys/sysmacros.h>. For historical compatibility, it is currently defined by <sys/types.h> as well, but we plan to remove this soon. To use "minor", include <sys/sysmacros.h> directly. If you did not intend to use a system-defined macro "minor", you should undefine it after including <sys/types.h>.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/pax/Makefile4
-rw-r--r--archivers/pax/files/pax.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile
index 0aaf914bfeb..396519ca092 100644
--- a/archivers/pax/Makefile
+++ b/archivers/pax/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2018/04/07 08:57:01 jperkin Exp $
+# $NetBSD: Makefile,v 1.53 2018/10/29 20:18:02 triaxx Exp $
DISTNAME= pax-20080110
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= archivers
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/archivers/pax/files/pax.h b/archivers/pax/files/pax.h
index 26d5319a9dc..e4fb6f7ae38 100644
--- a/archivers/pax/files/pax.h
+++ b/archivers/pax/files/pax.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pax.h,v 1.13 2014/03/14 22:16:50 ryoon Exp $ */
+/* $NetBSD: pax.h,v 1.14 2018/10/29 20:18:02 triaxx Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -265,7 +265,7 @@ typedef struct oplist {
# define major(x) ((int)(0x00ff & ((x) >> 8)))
# define minor(x) ((int)(0xffff00ff & (x)))
# define makedev(maj,min) ((0xff00 & ((maj)<<8))|(0xffff00ff & (min)))
-# elif defined(_SCO_DS)
+# elif defined(_SCO_DS) || defined(__linux__)
# include <sys/sysmacros.h>
# endif
# define MAJOR(x) major(x)