commit: 19d432b70f2e0d148b9185fb31ac489c83ad34f0
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Sep 28 17:51:22 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Sep 28 17:51:22 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=19d432b7
sys-fs/xfsprogs: version bump to 4.13.1
restore 4.9.0
sys-fs/xfsprogs/Manifest | 12 +-
.../xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch | 1 -
.../files/xfsprogs-4.9.0-cross-compile.patch | 143 +++++++++++++++++++++
sys-fs/xfsprogs/files/xfsprogs-4.9.0-musl.patch | 71 ++++++++++
sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild | 1 +
...sprogs-4.12.0.ebuild => xfsprogs-4.13.1.ebuild} | 24 ++--
...fsprogs-4.11.0.ebuild => xfsprogs-4.9.0.ebuild} | 9 +-
7 files changed, 240 insertions(+), 21 deletions(-)
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index d2f8665..cdc0a84 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,5 +1,5 @@
AUX xfsprogs-4.11.0-musl.patch 1835 SHA256
1387eebcf9e61ab50fea70e11f7d6873ae47e26f3fba99b8df2d17d6a2db1619 SHA512
dcfafb16d31c50c6c16ee2a778eda6c946646e129e6c9c96efeb518f7935534dcd7063aded186c5d874ffd07b6eaa31f3ff0e06e0cdca9876565056c727a5494
WHIRLPOOL
68b03ec3ccc1258e667e883910dfeaa65945ffdc893da5c752baea1ec6d7c859be85b8287392c951cf60315aee356dd463410d287ff673a2b70dfe9684a56bb9
-AUX xfsprogs-4.12.0-fix_musl.patch 3134 SHA256
a76aadd93aa62c7f942c2bc5d65db771075a00961ee422e9fd1f3abf67bfab93 SHA512
90aed5c33bfae13c89ffa26f076bd4c75f6562ec7bd87607238daa0e19e108e7de5f41025880d8314677c31ba54dd9acd4646e44bef139b7256033406427f30e
WHIRLPOOL
24e7ffbe1ad68688dabd4be1a1c7af60ea849a73ff78dc80b3a93e0b31bcc8a978da6f6e48bbcd7f1e8de7e37d061b87e4cec2c931c21d42eb8827d97c626df2
+AUX xfsprogs-4.12.0-fix_musl.patch 3133 SHA256
5dcd271717eebe2d301f2df4c439a359f26c3bad23a7d99c0d01bcec693b057b SHA512
882de116f5cfe71fb5d3ac81db50eca6a1b666ea40041ab1e922507bc17906055ac02335bce94c64dcb3ad8938a48064f5b364e8867a72ac19077cc92a93a249
WHIRLPOOL
9a40274f0971ee29bd5999eb4ffaea0d7a74c33a430e125152f0e7c569c002303187ad69630161a58b48c40bee2b4b6c382ea4379ae200bd23af0d09d71d43e3
AUX xfsprogs-4.12.0-sharedlibs.patch 2361 SHA256
4f10b622e8b7c8654a5dc79356343515ef203742ba4781b97a6f02f23e99555a SHA512
bbf802c54d2c8a2a524a9d4ae0ca66a18bf6b099a00fcc248abee04f84371bd35fc07a2dcc0c1d99c297b474c1f98d92927aa5ca16df5e6caef3abe386f31eba
WHIRLPOOL
72e00337e46700ee2a16597bb8188fff229c019c46a39f60598a6d802b8ba094c6e5da8377aad60fee6afd9f491c577d2c84ace3f78a00438268ccbc1832368a
AUX xfsprogs-4.3.0-cross-compile.patch 5112 SHA256
5654447555115bce22e443623f6fc17b767681741f043a9dc5e6887967a27db9 SHA512
2d6303b7c89b3e1ca2ba1d95a4477d0d1c2360ed68bf9c9d3630f990081be98ace9b9c164729635fa582cc5c8bd418e1824e35f613512d43cc6116fcda379582
WHIRLPOOL
1fee9f56739d13c1b04b2d0d190b193c97a846902fce8ccba0210cbce6a61bcd2cab118a2c59fb66cd89a957e32e714c3f1dc534697819165a505a8eb8f225b6
AUX xfsprogs-4.3.0-musl.patch 3543 SHA256
afe6ea3f95d88abc0b2c276e1c88dd8acc3bdbf10cf93cba54cae9d1de6e1e67 SHA512
7c86c402bda6630699e63b55389931d8a43c9ed6489c248bf090ca724516c56d4b2b3204dd07272a2e84e11abda8f0aa0735851c3f66330f6be258390a8dafe6
WHIRLPOOL
8fb46034afbea1b78c23e931d36920228ee401c0a72b4496eb40771b245c8a0f9800eb8794631362937ad0192fe959c1789fcee5a98d1788035c19219365cce7
@@ -7,11 +7,15 @@ AUX xfsprogs-4.3.0-sharedlibs.patch 2310 SHA256
23bf3127cd1eab6e96055d2a5f3ae61f
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-sharedlibs.patch 2355 SHA256
983b08b2a4a4ee91be21f14063167a3752554b41fd78aead6dfd6ac38702a5a7 SHA512
f0006ec0a987e44a1e60d642f9938d35c14ccb765c6a040c80e483a0e073e54608571b53793b7d4c2b9eb1f5c4e2f077fb713dfab9abaa99022d24d8a17443fe
WHIRLPOOL
939841084292f598c32aa3be784d6235b6803abd86062790191b7959be73d9f8afc31cbb0d330abaee253c141dcbe0d4a4e20ae76ba64146d41acfbf7f3e0fa4
+AUX xfsprogs-4.9.0-cross-compile.patch 3663 SHA256
0ed4d1d7cb43de579fe343c6b6e63d181f66c797e549ef1ceeabd6886a080b97 SHA512
150ebcc26b21eb3e52575dd6b4bf2f451abb4906071b66e79df3697a56345e178f6b9bb11a7bd19283adb47a6b5e9c1dd807775ac2c814f0e2db795788fd1159
WHIRLPOOL
191462575cfb9a0e7fc6d996d0e2819e92f0b63f552f503070485af8de6ccc410b468113c1f9cba0f18b476545a192aea326300423f14b0df9649973b482af5e
+AUX xfsprogs-4.9.0-musl.patch 1844 SHA256
9b73a3147b5d54ca9ae9a79cab7cd70c410ca1c307ae45c3ffcc10ae5a3d0005 SHA512
bf5de1b5e1906cdecda64c77c83410c32ce79a494959f905861b8b8de5676ab9d30aaa1c85a8188f36f8a46d07ba3f5bef862d65d0d56d8467eb7f05c6173765
WHIRLPOOL
3cb3f97d5eac7dca57099da99bd3434764534273dc03ad58fd4cd4099dacbc05fccab53d8ac5055b860c87ca41f32a051585bb6c06c41da1d0ceb32dd23dcd4f
AUX xfsprogs-4.9.0-underlinking.patch 731 SHA256
644713208fcce550cbe66de8aa3fc366449a838baaba2db030bfc6111f4de7b5 SHA512
2fcbaab48ca33cd2e8724cdc55d814a970beb5127c861f4b829ede9f501516733c6dabbfe0bfb1d23df01bb69538af5ca31eb403030e3d2ad9efd8643c509ac7
WHIRLPOOL
00a06a89374682e09379e98176990436cd716f4d2cab3f1801097dfd228a92562fc521ff0a6441dc080e26a2087034e8572cd72b836ed575c75ba972079c9c29
-DIST xfsprogs-4.11.0.tar.xz 1113480 SHA256
c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2 SHA512
2db59553e4442c999a718ccf712b01de80b1e3acd1c3e5f9f7f5dc59e6c9180aa1a42085363303fe454d441bc2f886e118fc2958320afa49c7a8886fcfb5d72c
WHIRLPOOL
df267970bbcbc3c8a05d02a5e334bdeb686acea74e647dee6e874bc083a64cecef7c45072619edfd4841856cf0b7c91056504207bbcd5f021b1a1b452ef794da
DIST xfsprogs-4.12.0.tar.xz 1128400 SHA256
b330ad8d737f4152ae511580102e2fc49212bb51dfb4b614084344abae46d0df SHA512
1dc4a0a5f40baf1d6398c8f07b4cb3ab796cf052c34b811d60b08c60a4700c2ced8d4d1adb878f8b85ba58cf3e1276db1477109de538fd427d3e359a52f59d4a
WHIRLPOOL
c18d3c9dfab8ccb877eb6fa9fa05be3c614a587c6cb616a9f18b52debb8ecacbd22056cb397ff9e69407c66e105d034458b41f0ba4275352f31398e64d303c02
+DIST xfsprogs-4.13.1.tar.xz 1133556 SHA256
8c64d349d191e24c84eeb1611be767e4a11b81016bd5b73f3a20a0bf39dd3536 SHA512
6c234a6c22aa3cabe0ea698c11175dca6c19d803989127ccb13b526ff6d34dcef9dd6e19ff0c4fb3903078f24210a8cfcd0508dac29d52fbee4dfed37d5888f3
WHIRLPOOL
89a84ce7b59fa52cd245493a28c6ad7f6e114dfe8044b2dad57b2cc626308ad1187ef812ace618085a083745acd3c37538903a6e2f935d9cd351c923559d9732
DIST xfsprogs-4.5.0.tar.gz 1524382 SHA256
e49beb314984efbd0d758abb5c6137db3bb60a88e59e1e94c00defb536cf89f8 SHA512
19c95551dc91ec46916f9a7e3d7976907664d32dd5fdc26af0ca62ca74c4b3c10f9e843aac8214ea9d1c0bf140c9f4e321d059808af01a623abedd5067011314
WHIRLPOOL
54d742635df024a63181da76c3220671610068363af85be2677521f20342595a5cebb2fd169945572351901ee2c9384f79f54a381ab3620dde22d863aa66d469
-EBUILD xfsprogs-4.11.0.ebuild 2750 SHA256
de77973986d0e862e0179e74fdd619cf99d54218d282b47324a4dd45c8e86398 SHA512
7113861301c0e1437133e813a6fb3d1653419d63385f7ba1040953cced4596ac091bc75bee991c82d17b7f4764634a5334a09100f8f9a5b6954154d357d8ee5e
WHIRLPOOL
e2c3ea570f178bccf6b0b2bcbb65638af7905931301d87b90ddefa0a469a6c266afec0e5bc370b0dd6a9ee318e376ce270b19fc21ae5687c5f5295101e051d48
-EBUILD xfsprogs-4.12.0.ebuild 2772 SHA256
04ca2d3cd42b3dc50ec559a82780253cc87d3302deaf9c1872c4be7cf698d4d3 SHA512
ce7afb45c259c606e01de7f916b4663df2ff583635f38159b6dd9136856bc66bf4d4ccca89748665f5541bcf904f7066b5d7677c0292fdd9b54be6172845e7c4
WHIRLPOOL
5b8440386b011db2cf71fbdc76bac6faec1766b6ef3dc5c02d37f6a7549531dd7edc6cf8ea6be548ad4f5fec5592d492923ef133064ba556a02f3d36240fc5c7
+DIST xfsprogs-4.9.0.tar.xz 1087940 SHA256
f1e60a9a54583dba82fa506dd9b59bdec110a968f80f507bf5f93b263af7a4df SHA512
990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7
WHIRLPOOL
a9b582a42967ce1e314cd0ac3518792c2e10f7bb1370151a68a09a8e21e40cc6818b9778dfdd248961c3a1a08a70424f0150219488a18bc5d60e5669702c472f
+EBUILD xfsprogs-4.12.0.ebuild 2794 SHA256
96554b852ceacc21cdcbe67eaf9212c12f68c1fcebf24f65cf52c655a17b1651 SHA512
28957f291d78f6a0140c83f390d021e5db6e7a08158a474b473cbaa4b565e89910472f84c47986cbd3c3e96d761400e731e75da2e9f6ff494a0d5f17b8fb2456
WHIRLPOOL
7aa1c3b3a154c5dcc3a26eacca2193084807463b49868c1be17b69fa19cddc118d9c3797bf71ac67dd476725fb6c12975d7ac52179d48e5fe33b9d272ffe4312
+EBUILD xfsprogs-4.13.1.ebuild 2729 SHA256
bf0996a06580b3b3dae7316ad7858c367c5dd0343756e61ea7e34eb75e597470 SHA512
28b2d93ca8f4cb41dff0201dfef82e4112d353eb066a462a0ff4324472c4086ce96af00c8575f7b4b4d77a8554bb3714d2e062c8dd8ab4526c76c43ec0499ff1
WHIRLPOOL
deb17ac0d3e047e5b75dd74102ea471297e11c8160f550ff2629ba308ccd8e83f76c6eeee3ef7dc8f97cb6003dfd09c859bb81fc0b2696b8645a0f4727971cee
EBUILD xfsprogs-4.5.0.ebuild 2936 SHA256
f4faccf78a63237359239504ba56946817e6c604ebf5836e2c094b0bb1255ff5 SHA512
7363f71ab6ba657735394682e38cdf4cf21db032c34167435a9d37f74db52f8e25319d172f3d007db2b64973b3bde28abd602b1d64a544122d28654cc3605054
WHIRLPOOL
17d12153e5cd04828ac71c41e2e59b32ed21e19af9e0d83f40b93619f800f85ae89f4c272496a7f59268b386e72e97b6a17bb46a370586cda957e3bcadf94616
+EBUILD xfsprogs-4.9.0.ebuild 2778 SHA256
e5ceb138e57eb5c7b470deb60642c987c0704b427dad466ef99c5edc16421da4 SHA512
3226e4d37c555fcebc9022346615d813ca31c93ad02b856e5ca4c5056d2440c02dbf8c9fdd908779bf048b662a3448afb0813494a43e2234b94852ed3f7062ed
WHIRLPOOL
9c8a36a5fbd7e0cd8ba5131b5678c32279f06356052a6744ea420801828f50db6546fadf15376b59c1602c18feb17a425daa3a790ecba1f84610ea396e4db644
MISC metadata.xml 257 SHA256
c1d4bdabe699c6d9fcdf3b7794a13b45f69e3826b814b422e4ca7e6893b99012 SHA512
9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
WHIRLPOOL
4afcbc79dd61237c778735b39060b3e294fdc07da5b0da6f7b40db92649ac71febddd7a0265502e102d8eec9664fd5af2071fff9428bfcb0a6bf06cf70c68a3d
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch
b/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch
index de647d9..efc57e4 100644
--- a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch
@@ -115,4 +115,3 @@ index 96641e0..4e2f648 100644
return 0;
--
2.13.3
-
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..fade102
--- /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@ -D_FILE_OFFSET_BITS=64
+
+ 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.12.0.ebuild
b/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild
index 730f86c..edc1a7b 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild
@@ -76,6 +76,7 @@ src_configure() {
fi
econf \
+ --enable-lib64=no \
$(use_enable nls gettext) \
$(use_enable readline) \
$(usex readline --disable-editline $(use_enable libedit
editline)) \
diff --git a/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild
b/sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild
similarity index 90%
copy from sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild
copy to sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild
index 730f86c..43ab0f6 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit eutils toolchain-funcs multilib
+inherit toolchain-funcs multilib
DESCRIPTION="xfs filesystem utilities"
HOMEPAGE="http://oss.sgi.com/projects/xfs/";
@@ -32,7 +32,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
"${FILESDIR}"/${PN}-4.9.0-underlinking.patch
"${FILESDIR}"/${PN}-4.11.0-musl.patch
- "${FILESDIR}"/${PN}-4.12.0-fix_musl.patch
)
pkg_setup() {
@@ -43,7 +42,7 @@ pkg_setup() {
}
src_prepare() {
- epatch "${PATCHES[@]}"
+ default
# LLDFLAGS is used for programs, so apply -all-static when USE=static
is enabled.
# Clear out -static from all flags since we want to link against
dynamic xfs libs.
@@ -68,18 +67,19 @@ src_configure() {
export OPTIMIZER=${CFLAGS}
unset PLATFORM # if set in user env, this breaks configure
- local myconf
+ local myconf=(
+ --enable-lib64=no
+ $(use_enable nls gettext)
+ $(use_enable readline)
+ $(usex readline --disable-editline $(use_enable libedit
editline))
+ )
if use static || use static-libs ; then
- myconf+=" --enable-static"
+ myconf+=( --enable-static )
else
- myconf+=" --disable-static"
+ myconf+=( --disable-static )
fi
- econf \
- $(use_enable nls gettext) \
- $(use_enable readline) \
- $(usex readline --disable-editline $(use_enable libedit
editline)) \
- ${myconf}
+ econf "${myconf[@]}"
MAKEOPTS+=" V=1"
}
diff --git a/sys-fs/xfsprogs/xfsprogs-4.11.0.ebuild
b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
similarity index 90%
rename from sys-fs/xfsprogs/xfsprogs-4.11.0.ebuild
rename to sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
index d1f4962..695dc3e 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.11.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
@@ -7,11 +7,11 @@ inherit eutils toolchain-funcs multilib
DESCRIPTION="xfs filesystem utilities"
HOMEPAGE="http://oss.sgi.com/projects/xfs/";
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz";
+SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz";
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="libedit nls readline static static-libs"
REQUIRED_USE="static? ( static-libs )"
@@ -30,8 +30,9 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-4.7.0-sharedlibs.patch
"${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
- "${FILESDIR}"/${PN}-4.9.0-underlinking.patch
- "${FILESDIR}"/${PN}-4.11.0-musl.patch
+ "${FILESDIR}"/${PN}-4.9.0-cross-compile.patch
+ "${FILESDIR}"/${P}-underlinking.patch
+ "${FILESDIR}"/${PN}-4.9.0-musl.patch
)
pkg_setup() {
