| 1 |
commit: 348988482c55e071b0019b3dfaf3297b489cc4e5 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 1 10:21:24 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 1 10:21:38 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34898848 |
| 7 |
|
| 8 |
app-arch/xar-1.8.0.0.452: unbreak build on Darwin |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/821178 |
| 11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 13 |
|
| 14 |
app-arch/xar/files/xar-1.8.0.0.452-linux.patch | 35 +++++++++++++++++++++----- |
| 15 |
1 file changed, 29 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-arch/xar/files/xar-1.8.0.0.452-linux.patch b/app-arch/xar/files/xar-1.8.0.0.452-linux.patch |
| 18 |
index 8cbe48acc44..a9e9575c400 100644 |
| 19 |
--- a/app-arch/xar/files/xar-1.8.0.0.452-linux.patch |
| 20 |
+++ b/app-arch/xar/files/xar-1.8.0.0.452-linux.patch |
| 21 |
@@ -1,30 +1,47 @@ |
| 22 |
--- a/configure.ac |
| 23 |
+++ b/configure.ac |
| 24 |
-@@ -199,7 +199,16 @@ |
| 25 |
+@@ -183,7 +183,7 @@ |
| 26 |
+ |
| 27 |
+ AC_TRY_COMPILE([#include <sys/types.h> |
| 28 |
+ #include <sys/acl.h>], [acl_t a], [AC_DEFINE([HAVE_SYS_ACL_H],[1], [define if you have sys/acl.h and it has a working acl_t type])]) |
| 29 |
+-AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h) |
| 30 |
++AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/vfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h) |
| 31 |
+ AC_CHECK_FUNCS(lgetxattr) |
| 32 |
+ AC_CHECK_FUNCS(lsetxattr) |
| 33 |
+ AC_CHECK_FUNCS(getxattr) |
| 34 |
+@@ -199,7 +199,22 @@ |
| 35 |
|
| 36 |
AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[#include <sys/types.h> |
| 37 |
#include <sys/param.h> |
| 38 |
-#include <sys/mount.h>]) |
| 39 |
+#include <sys/mount.h> |
| 40 |
-+#include <sys/vfs.h>]) |
| 41 |
++#ifdef HAVE_SYS_VFS_H |
| 42 |
++#include <sys/vfs.h> |
| 43 |
++#endif]) |
| 44 |
+AC_CHECK_MEMBERS([struct statfs.f_iosize],,,[#include <sys/types.h> |
| 45 |
+#include <sys/param.h> |
| 46 |
+#include <sys/mount.h> |
| 47 |
-+#include <sys/vfs.h>]) |
| 48 |
++#ifdef HAVE_SYS_VFS_H |
| 49 |
++#include <sys/vfs.h> |
| 50 |
++#endif]) |
| 51 |
+AC_CHECK_MEMBERS([struct statfs.f_bsize],,,[#include <sys/types.h> |
| 52 |
+#include <sys/param.h> |
| 53 |
+#include <sys/mount.h> |
| 54 |
-+#include <sys/vfs.h>]) |
| 55 |
++#ifdef HAVE_SYS_VFS_H |
| 56 |
++#include <sys/vfs.h> |
| 57 |
++#endif]) |
| 58 |
AC_CHECK_MEMBERS([struct statvfs.f_fstypename],,,[#include <sys/statvfs.h>]) |
| 59 |
AC_CHECK_MEMBERS([struct stat.st_flags]) |
| 60 |
|
| 61 |
--- a/lib/util.c |
| 62 |
+++ b/lib/util.c |
| 63 |
-@@ -40,6 +40,7 @@ |
| 64 |
+@@ -40,6 +40,9 @@ |
| 65 |
#include <sys/types.h> |
| 66 |
#include <sys/mount.h> |
| 67 |
#include <sys/param.h> |
| 68 |
-+#include <sys/vfs.h> |
| 69 |
++#ifdef HAVE_SYS_VFS_H |
| 70 |
++# include <sys/vfs.h> |
| 71 |
++#endif |
| 72 |
#include <arpa/inet.h> |
| 73 |
#include <string.h> |
| 74 |
#include <unistd.h> |
| 75 |
@@ -61,6 +78,12 @@ |
| 76 |
} |
| 77 |
--- a/include/config.h.in |
| 78 |
+++ b/include/config.h.in |
| 79 |
+@@ -1,4 +1,5 @@ |
| 80 |
+ #undef HAVE_SYS_STATFS_H |
| 81 |
++#undef HAVE_SYS_VFS_H |
| 82 |
+ #undef HAVE_SYS_XATTR_H |
| 83 |
+ #undef HAVE_SYS_EXTATTR_H |
| 84 |
+ #undef HAVE_SYS_PARAM_H |
| 85 |
@@ -15,6 +15,8 @@ |
| 86 |
#undef HAVE_STRUCT_STAT_ST_FLAGS |
| 87 |
#undef HAVE_STRUCT_STATVFS_F_FSTYPENAME |
Archives