From: "Aric Belsito" <lluixhi@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/musl:master commit in: sys-fs/xfsprogs/files/, sys-fs/xfsprogs/
Date: Sun, 8 Jan 2017 22:03:49 +0000 (UTC) [thread overview]
Message-ID: <1483912993.066c70e3c99ccd778b66f112b692f1c691257a48.lluixhi@gentoo> (raw)
commit: 066c70e3c99ccd778b66f112b692f1c691257a48
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Jan 8 22:03:13 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Jan 8 22:03:13 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=066c70e3
sys-fs/xfsprogs: Version bump to 4.9.0
sys-fs/xfsprogs/Manifest | 7 +-
sys-fs/xfsprogs/files/xfsprogs-4.7.0-musl.patch | 132 -------------------
.../files/xfsprogs-4.9.0-cross-compile.patch | 143 +++++++++++++++++++++
sys-fs/xfsprogs/files/xfsprogs-4.9.0-musl.patch | 71 ++++++++++
...xfsprogs-4.7.0.ebuild => xfsprogs-4.9.0.ebuild} | 12 +-
5 files changed, 224 insertions(+), 141 deletions(-)
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 1644488..aeb20cd 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -3,10 +3,11 @@ AUX xfsprogs-4.3.0-musl.patch 3543 SHA256 afe6ea3f95d88abc0b2c276e1c88dd8acc3bdb
AUX xfsprogs-4.3.0-sharedlibs.patch 2310 SHA256 23bf3127cd1eab6e96055d2a5f3ae61f417a8d4ae52d5c421be2bbb05576bb46 SHA512 6d7ad2bc8b74390f81ecfa3774c837d083dc7e3332bd2e5450c4d67805d54f9727afeace39755e5d1185a230abcc9644bf2eb1544708d81b4f93a419aad8fdf4 WHIRLPOOL 5adb3dbffcd788e27e228d9d04a5991a20fd4ae9b8c7e32996b33fe71451ce2a468299f5abb40ff416b8abff399a7c0f7b4d3102b10f4e6bd830b3d0b57768c8
AUX xfsprogs-4.5.0-linguas.patch 967 SHA256 79c3b0b1faacd8ec52d060f05dcf0e72b83d5892e96ab01c4e6821394e2344de SHA512 6d812dce622a3d38fe2b23e47c8f188012522dee3eaa6f002080f2b2ba8e50dc31ed8fc56d9e10b13d4f0dc54d6377b77d8a3823494176e843480e5226e79679 WHIRLPOOL 2a3de6cf5ed3463bc8299600c6c1a00dfe995d089034ae15a0a07c46e7f24507a3a98cb28641bb29a4e5193338deca1c18fa11c0bc9084b97786938ec2c19778
AUX xfsprogs-4.7.0-libxcmd-link.patch 880 SHA256 06cced4aeeb9a2d8c90e6d6fd1ff6571020122dbfe62140513f52bd82bf9abe8 SHA512 4484570c4bb387b6dfde5f31d8527f2222d33e120c365e3cbc6f488403b9e9d969d3f2a883ffcb145a11d57ace70c76fb1ba4a8ed75533f2089a197d463c8dd9 WHIRLPOOL c975535bbf431b86ee82806ce6dbfc0196d7c175d13b00aeccd747820a817169aa1d4958b62f97fb4c36a24f964692ef3ea1d3e0ff11c5cfbd04ba60ce2317df
-AUX xfsprogs-4.7.0-musl.patch 3379 SHA256 14888da03cd10f0c332bdd2868e55adad0e06f4c19de57bd88263302089e15ad SHA512 75412a92f29c62fac24c699874f27ef9e5308f549f96ad8b1062c96cfa203e817be322caa3d2afa5a6f46988bf7e930d80dbf92b7f8b0ba266bf6d7312a08a22 WHIRLPOOL de9068d3715fe971ad2f400e260376742f408782930a917fd3bdd4a8f18ca5b73521e092ae044ed477e2a489d5a7849fb0656c977363de3ebfb5793168838347
AUX xfsprogs-4.7.0-sharedlibs.patch 2355 SHA256 983b08b2a4a4ee91be21f14063167a3752554b41fd78aead6dfd6ac38702a5a7 SHA512 f0006ec0a987e44a1e60d642f9938d35c14ccb765c6a040c80e483a0e073e54608571b53793b7d4c2b9eb1f5c4e2f077fb713dfab9abaa99022d24d8a17443fe WHIRLPOOL 939841084292f598c32aa3be784d6235b6803abd86062790191b7959be73d9f8afc31cbb0d330abaee253c141dcbe0d4a4e20ae76ba64146d41acfbf7f3e0fa4
+AUX xfsprogs-4.9.0-cross-compile.patch 3640 SHA256 0686bb76b6ab822c8e733c3c1a97d7e5252274087c2435cfb8f6709f006ea746 SHA512 86d08e60bff1ea27c7692d90a1ba8b204aeb6df58afa14558ad5b429beada78bea8a526353548797e44e9959715394cdd4e53a1cd9272d32ce6bcad95cfadbe1 WHIRLPOOL 0cf805fb14e71933ad4f0e471a5a5a9232d9aaa98d9e98ce9697daafa08ad8a9ed7fef208828c5d975a6514e739b95f0ed5f5b3b0efbcf01fd6e2a0a54ac668e
+AUX xfsprogs-4.9.0-musl.patch 1844 SHA256 9b73a3147b5d54ca9ae9a79cab7cd70c410ca1c307ae45c3ffcc10ae5a3d0005 SHA512 bf5de1b5e1906cdecda64c77c83410c32ce79a494959f905861b8b8de5676ab9d30aaa1c85a8188f36f8a46d07ba3f5bef862d65d0d56d8467eb7f05c6173765 WHIRLPOOL 3cb3f97d5eac7dca57099da99bd3434764534273dc03ad58fd4cd4099dacbc05fccab53d8ac5055b860c87ca41f32a051585bb6c06c41da1d0ceb32dd23dcd4f
DIST xfsprogs-4.5.0.tar.gz 1524382 SHA256 e49beb314984efbd0d758abb5c6137db3bb60a88e59e1e94c00defb536cf89f8 SHA512 19c95551dc91ec46916f9a7e3d7976907664d32dd5fdc26af0ca62ca74c4b3c10f9e843aac8214ea9d1c0bf140c9f4e321d059808af01a623abedd5067011314 WHIRLPOOL 54d742635df024a63181da76c3220671610068363af85be2677521f20342595a5cebb2fd169945572351901ee2c9384f79f54a381ab3620dde22d863aa66d469
-DIST xfsprogs-4.7.0.tar.gz 1534909 SHA256 88580bb3e6847c3edef436703a4fae403fc19b20739db4c31166ee4b256178d7 SHA512 5184f1dbc3989f3c1f1b103d5cbd70462db107cfe113424166581ebcfaad4041c9c78f5d038f4bd4728ff99a2f9705219582ba9bfd10745354a1cab0b7dfe613 WHIRLPOOL 8157b2e8df5946acacc22ed761e38b382ef464f4984971148069b2f215418f4e23ac142721394439c041c236cbd460e0b56ff071d1c10e343070147709f42af3
+DIST xfsprogs-4.9.0.tar.xz 1087940 SHA256 f1e60a9a54583dba82fa506dd9b59bdec110a968f80f507bf5f93b263af7a4df SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7 WHIRLPOOL a9b582a42967ce1e314cd0ac3518792c2e10f7bb1370151a68a09a8e21e40cc6818b9778dfdd248961c3a1a08a70424f0150219488a18bc5d60e5669702c472f
EBUILD xfsprogs-4.5.0.ebuild 2943 SHA256 f4ffec8f7b659a4f6c0915fa545e946399884b6ac4c9407d81ab905a129d88d1 SHA512 2e7698b5d3b37203643c5e1bbba776f8d871fcd1c770c7aa09a61d785177751040abe2da372b7a7d4bb76d48ca1c85bd6641f7ca98feb489142534822da09f97 WHIRLPOOL c299f388ef6da99135ba26403fab96036fb9b7b1731a10207762c959b16e485791eb8418ba932f5974d69ee282ed58ab9fe6dbdfbc833bf5bb75b71d2b08db00
-EBUILD xfsprogs-4.7.0.ebuild 2795 SHA256 e374eceff3c654d90c8b185d67edd81148ad9e0c752c4daeb0cb7b4bd6939ab4 SHA512 9f471d22be91a3ff32454c942342b9b5ec7c012006d9d723275b907f1dbfc54e61499ad9d2cee7fc6e861991dc0a1774d1726ecdb1fc14337c941eae3661f057 WHIRLPOOL 39736443b5c9274443663b3fa26d9f7d902918247baf7361b46d104166ac9bf924d983fd75becb9e5da1076a7b8a83b145542bb33198e0af364c701ff8ef4673
+EBUILD xfsprogs-4.9.0.ebuild 2748 SHA256 005052e978b234249b8b2a97deb2c50e4e7706dbde121cfa8d8fb80c6003366d SHA512 71273d2f4f65eda1b8370b5e62ad7398b467701fceb63b13d55e2fa5e442967e4d22d08287a70a8a5f172a0429977f3557b9488c361c95da75acfb2ecbc130b4 WHIRLPOOL 313bd0e0369d6e5037e257bf1f9ff028639f7e1a522b78bffb95142d3863ba7353483d0c763378bbf2b1564cee92bff271d1dae4cef6e8f0bdfebf8f913a7282
MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-musl.patch b/sys-fs/xfsprogs/files/xfsprogs-4.7.0-musl.patch
deleted file mode 100644
index 0346907..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-musl.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -Naur xfsprogs-4.7.0.orig/fsr/xfs_fsr.c xfsprogs-4.7.0/fsr/xfs_fsr.c
---- xfsprogs-4.7.0.orig/fsr/xfs_fsr.c 2016-08-09 12:15:13.030533264 -0700
-+++ xfsprogs-4.7.0/fsr/xfs_fsr.c 2016-08-09 12:16:06.079242655 -0700
-@@ -36,6 +36,9 @@
- #define _PATH_FSRLAST "/var/tmp/.fsrlast_xfs"
- #define _PATH_PROC_MOUNTS "/proc/mounts"
-
-+#ifndef _PATH_MOUNTED
-+#define _PATH_MOUNTED MOUNTED
-+#endif
-
- char *progname;
-
-diff -Naur xfsprogs-4.7.0.orig/include/linux.h xfsprogs-4.7.0/include/linux.h
---- xfsprogs-4.7.0.orig/include/linux.h 2016-08-09 12:15:13.033533304 -0700
-+++ xfsprogs-4.7.0/include/linux.h 2016-08-09 12:17:26.447317100 -0700
-@@ -33,6 +33,35 @@
- #include <asm/types.h>
- #include <mntent.h>
- #include <linux/fs.h> /* fsxattr defintion for new kernels */
-+#include <fcntl.h>
-+#include <stdio.h>
-+
-+#ifndef __uint8_t
-+# define __uint8_t uint8_t
-+#endif
-+#ifndef __uint16_t
-+# define __uint16_t uint16_t
-+#endif
-+#ifndef __uint32_t
-+# define __uint32_t uint32_t
-+#endif
-+#ifndef __uint64_t
-+# define __uint64_t uint64_t
-+#endif
-+
-+#ifndef __int8_t
-+# define __int8_t int8_t
-+#endif
-+#ifndef __int16_t
-+# define __int16_t int16_t
-+#endif
-+#ifndef __int32_t
-+# define __int32_t int32_t
-+#endif
-+#ifndef __int64_t
-+# define __int64_t int64_t
-+#endif
-+
-
- static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
- {
-diff -Naur xfsprogs-4.7.0.orig/io/readdir.c xfsprogs-4.7.0/io/readdir.c
---- xfsprogs-4.7.0.orig/io/readdir.c 2016-08-09 12:15:13.038533371 -0700
-+++ xfsprogs-4.7.0/io/readdir.c 2016-08-09 12:18:16.185982058 -0700
-@@ -24,6 +24,18 @@
- #include <sys/types.h>
- #include <dirent.h>
-
-+#if defined (__linux__)
-+# ifndef _DIRENT_HAVE_D_OFF
-+# define _DIRENT_HAVE_D_OFF
-+# endif
-+# ifndef _DIRENT_HAVE_D_RECLEN
-+# define _DIRENT_HAVE_D_RECLEN
-+# endif
-+# ifndef _DIRENT_HAVE_D_TYPE
-+# define _DIRENT_HAVE_D_TYPE
-+# endif
-+#endif
-+
- static struct cmdinfo readdir_cmd;
-
- const char *d_type_str(unsigned int type)
-diff -Naur xfsprogs-4.7.0.orig/libxfs/linux.c xfsprogs-4.7.0/libxfs/linux.c
---- xfsprogs-4.7.0.orig/libxfs/linux.c 2016-08-09 12:15:13.043533438 -0700
-+++ xfsprogs-4.7.0/libxfs/linux.c 2016-08-09 12:23:08.978520714 -0700
-@@ -16,11 +16,8 @@
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--#define ustat __kernel_ustat
- #include <mntent.h>
- #include <sys/stat.h>
--#undef ustat
--#include <sys/ustat.h>
- #include <sys/mount.h>
- #include <sys/ioctl.h>
- #include <sys/sysinfo.h>
-@@ -51,9 +48,12 @@
- int
- platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
- {
-- /* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */
-- struct ustat ust[2];
- struct stat64 st;
-+ FILE *f;
-+ struct stat64 mst;
-+ struct mntent *mnt;
-+ char mounts[MAXPATHLEN];
-+ int ismounted = 0;
-
- if (!s) {
- if (stat64(block, &st) < 0)
-@@ -63,14 +63,24 @@
- s = &st;
- }
-
-- if (ustat(s->st_rdev, ust) >= 0) {
-+ strcpy(mounts, (!access(PROC_MOUNTED, R_OK)) ? PROC_MOUNTED : MOUNTED);
-+ if ((f = setmntent(mounts, "r")) == NULL)
-+ return 0;
-+
-+ while ((mnt = getmntent(f)) != NULL) {
-+ if (stat64(mnt->mnt_dir, &mst) < 0)
-+ continue;
-+ if (mst.st_dev != s->st_rdev)
-+ continue;
- if (verbose)
- fprintf(stderr,
- _("%s: %s contains a mounted filesystem\n"),
- progname, name);
-- return 1;
-+ ismounted = 1;
-+ break;
- }
-- return 0;
-+ endmntent(f);
-+ return ismounted;
- }
-
- int
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch
new file mode 100644
index 0000000..f4232b3
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch
@@ -0,0 +1,143 @@
+--- xfsprogs-4.9.0/configure
++++ xfsprogs-4.9.0/configure
+@@ -861,6 +861,7 @@
+ enable_blkid
+ enable_gettext
+ enable_shared
++BUILD_CFLAGS
+ BUILD_CC
+ CPP
+ OTOOL64
+@@ -960,7 +961,9 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP'
++CPP
++BUILD_CC
++BUILD_CFLAGS'
+
+
+ # Initialize some variables set by options.
+@@ -1616,6 +1619,9 @@
+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
++ BUILD_CC C compiler for build tools
++ BUILD_CFLAGS
++ C compiler flags for build tools
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -11116,11 +11122,12 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-if test $cross_compiling = no; then
+- BUILD_CC="$CC"
+
+-else
+- for ac_prog in gcc cc
++if test "${BUILD_CC+set}" != "set"; then
++ if test $cross_compiling = no; then
++ BUILD_CC="$CC"
++ else
++ for ac_prog in gcc cc
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -11162,6 +11169,15 @@
+ test -n "$BUILD_CC" && break
+ done
+
++ fi
++fi
++
++if test "${BUILD_CFLAGS+set}" != "set"; then
++ if test $cross_compiling = no; then
++ BUILD_CFLAGS="$CFLAGS"
++ else
++ BUILD_CFLAGS="-g -O2"
++ fi
+ fi
+
+ # Check whether --enable-shared was given.
+--- xfsprogs-4.9.0/configure.ac
++++ xfsprogs-4.9.0/configure.ac
+@@ -9,11 +9,21 @@
+ AC_PROG_LIBTOOL
+
+ AC_PROG_CC
+-if test $cross_compiling = no; then
+- BUILD_CC="$CC"
+- AC_SUBST(BUILD_CC)
+-else
+- AC_CHECK_PROGS(BUILD_CC, gcc cc)
++AC_ARG_VAR(BUILD_CC, [C compiler for build tools])
++if test "${BUILD_CC+set}" != "set"; then
++ if test $cross_compiling = no; then
++ BUILD_CC="$CC"
++ else
++ AC_CHECK_PROGS(BUILD_CC, gcc cc)
++ fi
++fi
++AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools])
++if test "${BUILD_CFLAGS+set}" != "set"; then
++ if test $cross_compiling = no; then
++ BUILD_CFLAGS="$CFLAGS"
++ else
++ BUILD_CFLAGS="-g -O2"
++ fi
+ fi
+
+ AC_ARG_ENABLE(shared,
+--- xfsprogs-4.9.0/include/builddefs.in
++++ xfsprogs-4.9.0/include/builddefs.in
+@@ -26,6 +26,7 @@
+ LOADERFLAGS = @LDFLAGS@
+ LTLDFLAGS = @LDFLAGS@
+ CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64
++BUILD_CFLAGS = @BUILD_CFLAGS@
+
+ LIBRT = @librt@
+ LIBUUID = @libuuid@
+@@ -154,7 +155,7 @@
+ endif
+
+
+-GCFLAGS = $(OPTIMIZER) $(DEBUG) \
++GCFLAGS = $(DEBUG) \
+ -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \
+ -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(TOPDIR)/libxfs
+
+@@ -162,8 +163,9 @@
+ GCFLAGS += -DENABLE_GETTEXT
+ endif
+
++BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS)
+ # First, Global, Platform, Local CFLAGS
+-CFLAGS += $(FCFLAGS) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
++CFLAGS += $(FCFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
+
+ include $(TOPDIR)/include/buildmacros
+
+--- xfsprogs-4.9.0/libxfs/Makefile
++++ xfsprogs-4.9.0/libxfs/Makefile
+@@ -124,7 +124,7 @@
+
+ crc32table.h: gen_crc32table.c
+ @echo " [CC] gen_crc32table"
+- $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $<
++ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table $<
+ @echo " [GENERATE] $@"
+ $(Q) ./gen_crc32table > crc32table.h
+
+@@ -135,7 +135,7 @@
+ # disk.
+ crc32selftest: gen_crc32table.c crc32table.h crc32.c
+ @echo " [TEST] CRC32"
+- $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
++ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
+ $(Q) ./$@
+
+ # set up include/xfs header directory
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-musl.patch b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-musl.patch
new file mode 100644
index 0000000..cbe6911
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-musl.patch
@@ -0,0 +1,71 @@
+diff -Naur xfsprogs-4.9.0.orig/fsr/xfs_fsr.c xfsprogs-4.9.0/fsr/xfs_fsr.c
+--- xfsprogs-4.9.0.orig/fsr/xfs_fsr.c 2017-01-08 13:58:12.354784273 -0800
++++ xfsprogs-4.9.0/fsr/xfs_fsr.c 2017-01-08 13:58:45.262063929 -0800
+@@ -36,6 +36,9 @@
+ #define _PATH_FSRLAST "/var/tmp/.fsrlast_xfs"
+ #define _PATH_PROC_MOUNTS "/proc/mounts"
+
++#ifndef _PATH_MOUNTED
++#define _PATH_MOUNTED MOUNTED
++#endif
+
+ char *progname;
+
+diff -Naur xfsprogs-4.9.0.orig/include/linux.h xfsprogs-4.9.0/include/linux.h
+--- xfsprogs-4.9.0.orig/include/linux.h 2017-01-08 13:58:12.335784111 -0800
++++ xfsprogs-4.9.0/include/linux.h 2017-01-08 13:59:38.554516824 -0800
+@@ -40,6 +40,32 @@
+ # undef fsxattr
+ #endif
+
++#ifndef __uint8_t
++# define __uint8_t uint8_t
++#endif
++#ifndef __uint16_t
++# define __uint16_t uint16_t
++#endif
++#ifndef __uint32_t
++# define __uint32_t uint32_t
++#endif
++#ifndef __uint64_t
++# define __uint64_t uint64_t
++#endif
++
++#ifndef __int8_t
++# define __int8_t int8_t
++#endif
++#ifndef __int16_t
++# define __int16_t int16_t
++#endif
++#ifndef __int32_t
++# define __int32_t int32_t
++#endif
++#ifndef __int64_t
++# define __int64_t int64_t
++#endif
++
+ static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
+ {
+ return ioctl(fd, cmd, p);
+diff -Naur xfsprogs-4.9.0.orig/io/readdir.c xfsprogs-4.9.0/io/readdir.c
+--- xfsprogs-4.9.0.orig/io/readdir.c 2017-01-08 13:58:12.357784298 -0800
++++ xfsprogs-4.9.0/io/readdir.c 2017-01-08 14:00:04.662738699 -0800
+@@ -24,6 +24,18 @@
+ #include <sys/types.h>
+ #include <dirent.h>
+
++#if defined (__linux__)
++# ifndef _DIRENT_HAVE_D_OFF
++# define _DIRENT_HAVE_D_OFF
++# endif
++# ifndef _DIRENT_HAVE_D_RECLEN
++# define _DIRENT_HAVE_D_RECLEN
++# endif
++# ifndef _DIRENT_HAVE_D_TYPE
++# define _DIRENT_HAVE_D_TYPE
++# endif
++#endif
++
+ static struct cmdinfo readdir_cmd;
+
+ const char *d_type_str(unsigned int type)
diff --git a/sys-fs/xfsprogs/xfsprogs-4.7.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
similarity index 90%
rename from sys-fs/xfsprogs/xfsprogs-4.7.0.ebuild
rename to sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
index 1db7e11..6e7b991 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.7.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI="5"
+EAPI=5
inherit eutils toolchain-funcs multilib
DESCRIPTION="xfs filesystem utilities"
HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
- ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
+SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
@@ -31,8 +31,8 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-4.7.0-sharedlibs.patch
"${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
- "${FILESDIR}"/${PN}-4.3.0-cross-compile.patch
- "${FILESDIR}"/${PN}-4.7.0-musl.patch
+ "${FILESDIR}"/${PN}-4.9.0-cross-compile.patch
+ "${FILESDIR}"/${PN}-4.9.0-musl.patch
)
pkg_setup() {
next reply other threads:[~2017-01-08 22:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-08 22:03 Aric Belsito [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-07-25 18:52 [gentoo-commits] proj/musl:master commit in: sys-fs/xfsprogs/files/, sys-fs/xfsprogs/ Jory Pratt
2018-03-16 13:21 Anthony G. Basile
2018-04-09 16:11 Jory Pratt
2018-12-29 20:19 Anthony G. Basile
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1483912993.066c70e3c99ccd778b66f112b692f1c691257a48.lluixhi@gentoo \
--to=lluixhi@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox