mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-18 21:11:08 +02:00
Merge pull request #516 from dm0-/bugs-1760
bump(sys-fs/xfsprogs): sync with upstream
This commit is contained in:
David Michael
GitHub
commit
f4038fd996
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/xfsprogs-4.5.0
vendored
Normal file
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/xfsprogs-4.5.0
vendored
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
DEFINED_PHASES=configure install prepare setup
|
||||||
|
DEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3 static? ( >=sys-apps/util-linux-2.17.2[static-libs(+)] readline? ( sys-libs/readline:0=[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses:0=[static-libs] ) ) nls? ( sys-devel/gettext )
|
||||||
|
DESCRIPTION=xfs filesystem utilities
|
||||||
|
EAPI=5
|
||||||
|
HOMEPAGE=http://oss.sgi.com/projects/xfs/
|
||||||
|
IUSE=libedit nls readline static static-libs
|
||||||
|
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
|
||||||
|
LICENSE=LGPL-2.1
|
||||||
|
RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
|
||||||
|
REQUIRED_USE=static? ( static-libs )
|
||||||
|
SLOT=0
|
||||||
|
SRC_URI=ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-4.5.0.tar.gz ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/xfsprogs-4.5.0.tar.gz
|
||||||
|
_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||||
|
_md5_=015c37746c044ed6447e685839b1c8e3
|
||||||
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/xfsprogs-4.7.0
vendored
Normal file
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/xfsprogs-4.7.0
vendored
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
DEFINED_PHASES=configure install prepare setup
|
||||||
|
DEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3 static? ( >=sys-apps/util-linux-2.17.2[static-libs(+)] readline? ( sys-libs/readline:0=[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses:0=[static-libs] ) ) nls? ( sys-devel/gettext )
|
||||||
|
DESCRIPTION=xfs filesystem utilities
|
||||||
|
EAPI=5
|
||||||
|
HOMEPAGE=http://oss.sgi.com/projects/xfs/
|
||||||
|
IUSE=libedit nls readline static static-libs
|
||||||
|
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
|
||||||
|
LICENSE=LGPL-2.1
|
||||||
|
RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
|
||||||
|
REQUIRED_USE=static? ( static-libs )
|
||||||
|
SLOT=0
|
||||||
|
SRC_URI=ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-4.7.0.tar.gz ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/xfsprogs-4.7.0.tar.gz
|
||||||
|
_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||||
|
_md5_=48286592110f1c7e51477076bbfb2416
|
||||||
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/xfsprogs-4.8.0
vendored
Normal file
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/xfsprogs-4.8.0
vendored
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
DEFINED_PHASES=configure install prepare setup
|
||||||
|
DEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3 static? ( >=sys-apps/util-linux-2.17.2[static-libs(+)] readline? ( sys-libs/readline:0=[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses:0=[static-libs] ) ) nls? ( sys-devel/gettext )
|
||||||
|
DESCRIPTION=xfs filesystem utilities
|
||||||
|
EAPI=5
|
||||||
|
HOMEPAGE=http://oss.sgi.com/projects/xfs/
|
||||||
|
IUSE=libedit nls readline static static-libs
|
||||||
|
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
|
||||||
|
LICENSE=LGPL-2.1
|
||||||
|
RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
|
||||||
|
REQUIRED_USE=static? ( static-libs )
|
||||||
|
SLOT=0
|
||||||
|
SRC_URI=ftp://ftp.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.8.0.tar.xz
|
||||||
|
_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||||
|
_md5_=cfeb4227b3dde0fc2566baeffa61b124
|
||||||
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/xfsprogs-4.9.0
vendored
Normal file
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/xfsprogs-4.9.0
vendored
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
DEFINED_PHASES=configure install prepare setup
|
||||||
|
DEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3 static? ( >=sys-apps/util-linux-2.17.2[static-libs(+)] readline? ( sys-libs/readline:0=[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses:0=[static-libs] ) ) nls? ( sys-devel/gettext )
|
||||||
|
DESCRIPTION=xfs filesystem utilities
|
||||||
|
EAPI=5
|
||||||
|
HOMEPAGE=http://oss.sgi.com/projects/xfs/
|
||||||
|
IUSE=libedit nls readline static static-libs
|
||||||
|
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
|
||||||
|
LICENSE=LGPL-2.1
|
||||||
|
RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
|
||||||
|
REQUIRED_USE=static? ( static-libs )
|
||||||
|
SLOT=0
|
||||||
|
SRC_URI=ftp://ftp.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.9.0.tar.xz
|
||||||
|
_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||||
|
_md5_=a153c4556f07d6561a76b292afd7bef8
|
||||||
18
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/Manifest
vendored
Normal file
18
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/Manifest
vendored
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
AUX xfsprogs-4.3.0-cross-compile.patch 5112 SHA256 5654447555115bce22e443623f6fc17b767681741f043a9dc5e6887967a27db9 SHA512 2d6303b7c89b3e1ca2ba1d95a4477d0d1c2360ed68bf9c9d3630f990081be98ace9b9c164729635fa582cc5c8bd418e1824e35f613512d43cc6116fcda379582 WHIRLPOOL 1fee9f56739d13c1b04b2d0d190b193c97a846902fce8ccba0210cbce6a61bcd2cab118a2c59fb66cd89a957e32e714c3f1dc534697819165a505a8eb8f225b6
|
||||||
|
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-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-underlinking.patch 731 SHA256 644713208fcce550cbe66de8aa3fc366449a838baaba2db030bfc6111f4de7b5 SHA512 2fcbaab48ca33cd2e8724cdc55d814a970beb5127c861f4b829ede9f501516733c6dabbfe0bfb1d23df01bb69538af5ca31eb403030e3d2ad9efd8643c509ac7 WHIRLPOOL 00a06a89374682e09379e98176990436cd716f4d2cab3f1801097dfd228a92562fc521ff0a6441dc080e26a2087034e8572cd72b836ed575c75ba972079c9c29
|
||||||
|
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.8.0.tar.xz 1088376 SHA256 82ce9cb3a55f4e208e8fe3471ff0aff0602b8300f3e50bdf05cc7e11549686f9 SHA512 9c83763ae4925980969e66827edef41774e4dc09ae42637630167b5e0329675517ea7b50de751fcb9485fbcf8e470d24dd20b51475bcb56723dae6ee9fb140c7 WHIRLPOOL dc9f9b5c0b4e9b61f023fb972137126f22909c77908990e1beb391689fe6512a7810d9bd1ccfc0cfe4cd5379d99c123ddc9d0b6194e0a81e946e2304f964f180
|
||||||
|
DIST xfsprogs-4.9.0.tar.xz 1087940 SHA256 f1e60a9a54583dba82fa506dd9b59bdec110a968f80f507bf5f93b263af7a4df SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7 WHIRLPOOL a9b582a42967ce1e314cd0ac3518792c2e10f7bb1370151a68a09a8e21e40cc6818b9778dfdd248961c3a1a08a70424f0150219488a18bc5d60e5669702c472f
|
||||||
|
EBUILD xfsprogs-4.5.0.ebuild 2883 SHA256 01571b6cda621009f85aa54dcaa9ab0b1d2364e102b340749272a6a979047562 SHA512 88f38948f1cbcc76d09bab580336a9d7433883bcafa4c9e096dae05b9024051d1938f66ec732f96e1d3e5e31b1e87b13584c80ee217734867a6db86e7cf909c9 WHIRLPOOL d33ebc7e8f6478bf6a37abe968d9e074468c9342b349308b84894824f8b0ed4f25c73dc9cc49ce1c0a47fba73215be2289f7db4c8b3164fddc3951da6a6f2f08
|
||||||
|
EBUILD xfsprogs-4.7.0.ebuild 2742 SHA256 0f795acbe6daa5f9b10bc8b7c55239498a6762bb0d7cf450659afa9e25041e2b SHA512 f677b0bf8f5636b8faa5ba31aca692906d70ebb386df2f32a35c7b00dd4640398a210e5b755e84a57ce1b6a18304566c83c5efcc7ede26968aba8e8e73f792d6 WHIRLPOOL 4fc30d6450dee89b40aa91b04323e63d54bbb59460767b5eaf0497e9fd923d2c0d68892f4a7ad34b93410d302216d8a339b5d874e689300b1b85c33cbff04892
|
||||||
|
EBUILD xfsprogs-4.8.0.ebuild 2688 SHA256 ba433acced1643badeb5f48f8c8b5e4fd09b697e787939325a67245102a3617c SHA512 d7bd740319dbe6859a742e925da436530a5749841bb6bd83d96839ace5c485d4ab186e4a0fb78e0eb34aee8bdcb59ee119aac30fc6f4ac8af968fd70b6d6a03e WHIRLPOOL 15181129a5fa496c00225b744f145d3332d4c976baae7f49c01552e4793187d31255c119d8890973d48b935edec3d31915da6fada3fb923958f24ab92f0e558f
|
||||||
|
EBUILD xfsprogs-4.9.0.ebuild 2727 SHA256 e13502a33b0b8b74577603c44bcccd46b14835eb1618bf52e0852668c5e6ba9b SHA512 8f9427a53fc61d958873f74f5dce118b15b730e07616c07005e0298421466f1d2d5f41f26bfd6bd152c8dfac007f6f02c04c4f44a805623a75245d3b9055c0bb WHIRLPOOL 3de3de3d8016e7c4502a3e32af53dbaab532ea125006110c04ad5e9cb2db972d0f9682e228c99c0d3b1c2519abe9b26f4f38f34c1a9454e113ebd1f5aa07a112
|
||||||
|
MISC ChangeLog 7808 SHA256 2394e793a2c85a4c800ab3548fed0aec55247485f31c61385994365b0be76a26 SHA512 043b5ff15b946707fbbe84471d5daada8630ac7338afacd5f0eab75618c8fb3a052f8c8696caefaad45f6597880c701ec961048cc1f6a1afa9e6f9a0c90f0809 WHIRLPOOL 6d80d2202148bdc8288acc75c7e0d60c94ce1a7e635083790c0f442c1e208c0386dfbdd81b5064c7b93b28e8afde47b6f985cf4694141f03e8d488a04d651969
|
||||||
|
MISC ChangeLog-2015 28799 SHA256 dd1a390d3e1f144f1a84f7261aa84fd4bf9840e63c486e50e438777f8c4cc21f SHA512 8c0afd13653f5aad5a76d431a0940d7c84d6ec6a5783c8ed9905a67dec474264981a9b66aa500ad66886e2a09cdbfcc13b6ae86c92d49e349e06716ba5a401c6 WHIRLPOOL c765b8c79e1e006978c2ee663c024a31063f395cccceb063f01e5bec98e74bb1352dc2f213970e3fadcbb63db03b6c6c2856580c7b5fc422c0f4441655ef48c0
|
||||||
|
MISC metadata.xml 257 SHA256 c1d4bdabe699c6d9fcdf3b7794a13b45f69e3826b814b422e4ca7e6893b99012 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1 WHIRLPOOL 4afcbc79dd61237c778735b39060b3e294fdc07da5b0da6f7b40db92649ac71febddd7a0265502e102d8eec9664fd5af2071fff9428bfcb0a6bf06cf70c68a3d
|
||||||
@ -0,0 +1,181 @@
|
|||||||
|
From 1a366eedc0eb4da46da48e9f6e2da27c7b5d2076 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Gwendal Grignou <gwendal@chromium.org>
|
||||||
|
Date: Fri, 3 Jun 2016 09:17:28 -0700
|
||||||
|
Subject: [PATCH] Allow compiling xfsprogs in a cross compile environment.
|
||||||
|
|
||||||
|
Without this patch, we are using the same compiler and options for the host
|
||||||
|
compiler (BUILD_CC) and the target compiler (CC), and we would get error
|
||||||
|
messages at compilation:
|
||||||
|
x86_64-pc-linux-gnu-gcc -O2 -O2 -pipe -march=armv7-a -mtune=cortex-a15 ...
|
||||||
|
x86_64-pc-linux-gnu-gcc.real: error: unrecognized command line option
|
||||||
|
'-mfpu=neon'
|
||||||
|
'-mfloat-abi=hard'
|
||||||
|
'-clang-syntax'
|
||||||
|
'-mfpu=neon'
|
||||||
|
'-mfloat-abi=hard'
|
||||||
|
'-clang-syntax'
|
||||||
|
|
||||||
|
Add BUILD_CC and BUILD_CFLAGS as precious variables to allow setting it up
|
||||||
|
from the ebuild.
|
||||||
|
|
||||||
|
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
|
||||||
|
---
|
||||||
|
configure | 26 +++++++++++++++++++++-----
|
||||||
|
configure.ac | 20 +++++++++++++++-----
|
||||||
|
include/builddefs.in | 6 ++++--
|
||||||
|
libxfs/Makefile | 4 ++--
|
||||||
|
4 files changed, 42 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure b/configure
|
||||||
|
index 325081f..863a447 100755
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -700,6 +700,7 @@ libreadline
|
||||||
|
enable_blkid
|
||||||
|
enable_gettext
|
||||||
|
enable_shared
|
||||||
|
+BUILD_CFLAGS
|
||||||
|
BUILD_CC
|
||||||
|
CPP
|
||||||
|
LT_SYS_LIBRARY_PATH
|
||||||
|
@@ -806,7 +807,9 @@ LDFLAGS
|
||||||
|
LIBS
|
||||||
|
CPPFLAGS
|
||||||
|
LT_SYS_LIBRARY_PATH
|
||||||
|
-CPP'
|
||||||
|
+CPP
|
||||||
|
+BUILD_CC
|
||||||
|
+BUILD_CFLAGS'
|
||||||
|
|
||||||
|
|
||||||
|
# Initialize some variables set by options.
|
||||||
|
@@ -1456,6 +1459,9 @@ Some influential environment variables:
|
||||||
|
LT_SYS_LIBRARY_PATH
|
||||||
|
User-defined run-time library search path.
|
||||||
|
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.
|
||||||
|
@@ -11957,11 +11963,12 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||||
|
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
|
||||||
|
@@ -12003,6 +12010,15 @@ fi
|
||||||
|
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.
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index d44438f..fc286b3 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -9,11 +9,21 @@ AC_PREFIX_DEFAULT(/usr)
|
||||||
|
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,
|
||||||
|
diff --git a/include/builddefs.in b/include/builddefs.in
|
||||||
|
index c2ca4cb..9ca57a6 100644
|
||||||
|
--- a/include/builddefs.in
|
||||||
|
+++ b/include/builddefs.in
|
||||||
|
@@ -27,6 +27,7 @@ MALLOCLIB = @malloc_lib@
|
||||||
|
LOADERFLAGS = @LDFLAGS@
|
||||||
|
LTLDFLAGS = @LDFLAGS@
|
||||||
|
CFLAGS = @CFLAGS@
|
||||||
|
+BUILD_CFLAGS = @BUILD_CFLAGS@
|
||||||
|
|
||||||
|
LIBRT = @librt@
|
||||||
|
LIBUUID = @libuuid@
|
||||||
|
@@ -150,7 +151,7 @@ PCFLAGS+= -DENABLE_BLKID
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
-GCFLAGS = $(OPTIMIZER) $(DEBUG) \
|
||||||
|
+GCFLAGS = $(DEBUG) \
|
||||||
|
-DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \
|
||||||
|
-DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(TOPDIR)/libxfs
|
||||||
|
|
||||||
|
@@ -158,8 +159,9 @@ ifeq ($(ENABLE_GETTEXT),yes)
|
||||||
|
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
|
||||||
|
|
||||||
|
diff --git a/libxfs/Makefile b/libxfs/Makefile
|
||||||
|
index 873d4ec..8d728c0 100644
|
||||||
|
--- a/libxfs/Makefile
|
||||||
|
+++ b/libxfs/Makefile
|
||||||
|
@@ -111,7 +111,7 @@ default: crc32selftest ltdepend $(LTLIBRARY)
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
@@ -122,7 +122,7 @@ crc32table.h: gen_crc32table.c
|
||||||
|
# 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
|
||||||
|
--
|
||||||
|
2.8.0.rc3.226.g39d4020
|
||||||
@ -0,0 +1,80 @@
|
|||||||
|
--- xfsprogs-4.3.0/include/buildmacros
|
||||||
|
+++ xfsprogs-4.3.0/include/buildmacros
|
||||||
|
@@ -70,18 +70,9 @@
|
||||||
|
# /usr/lib.
|
||||||
|
ifeq ($(ENABLE_SHARED),yes)
|
||||||
|
INSTALL_LTLIB_DEV = \
|
||||||
|
- cd $(TOPDIR)/$(LIBNAME)/.libs; \
|
||||||
|
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
|
||||||
|
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
|
||||||
|
- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
|
||||||
|
- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
|
||||||
|
- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
|
||||||
|
- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
|
||||||
|
- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
|
||||||
|
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
|
||||||
|
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
|
||||||
|
- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
|
||||||
|
- fi
|
||||||
|
+ set -e; cd $(TOPDIR)/$(LIBNAME); \
|
||||||
|
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
|
||||||
|
+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
|
||||||
|
else
|
||||||
|
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
|
||||||
|
endif
|
||||||
|
--- xfsprogs-4.3.0/libxcmd/Makefile
|
||||||
|
+++ xfsprogs-4.3.0/libxcmd/Makefile
|
||||||
|
@@ -34,6 +34,9 @@
|
||||||
|
|
||||||
|
include $(BUILDRULES)
|
||||||
|
|
||||||
|
-install install-dev: default
|
||||||
|
+install: default
|
||||||
|
+
|
||||||
|
+install-dev: default
|
||||||
|
+ $(INSTALL_LTLIB_DEV)
|
||||||
|
|
||||||
|
-include .ltdep
|
||||||
|
--- xfsprogs-4.3.0/libxfs/Makefile
|
||||||
|
+++ xfsprogs-4.3.0/libxfs/Makefile
|
||||||
|
@@ -138,6 +138,7 @@
|
||||||
|
|
||||||
|
install-dev: install
|
||||||
|
$(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
|
||||||
|
+ $(INSTALL_LTLIB_DEV)
|
||||||
|
|
||||||
|
# We need to install the headers before building the dependencies. If we
|
||||||
|
# include the .ltdep file, the makefile decides that it needs to build the
|
||||||
|
--- xfsprogs-4.3.0/libxlog/Makefile
|
||||||
|
+++ xfsprogs-4.3.0/libxlog/Makefile
|
||||||
|
@@ -12,6 +12,8 @@
|
||||||
|
|
||||||
|
CFILES = xfs_log_recover.c util.c
|
||||||
|
|
||||||
|
+LTLIBS = $(LIBUUID) $(LIBXFS)
|
||||||
|
+
|
||||||
|
# don't want to link xfs_repair with a debug libxlog.
|
||||||
|
DEBUG = -DNDEBUG
|
||||||
|
|
||||||
|
@@ -19,6 +21,9 @@
|
||||||
|
|
||||||
|
include $(BUILDRULES)
|
||||||
|
|
||||||
|
-install install-dev: default
|
||||||
|
+install: default
|
||||||
|
+
|
||||||
|
+install-dev: default
|
||||||
|
+ $(INSTALL_LTLIB_DEV)
|
||||||
|
|
||||||
|
-include .ltdep
|
||||||
|
--- xfsprogs-4.3.0/Makefile
|
||||||
|
+++ xfsprogs-4.3.0/Makefile
|
||||||
|
@@ -82,6 +82,8 @@
|
||||||
|
quota: libxcmd
|
||||||
|
repair: libxlog
|
||||||
|
copy: libxlog
|
||||||
|
+libxlog: libxfs
|
||||||
|
+libxlog-install-dev: libxfs-install-dev
|
||||||
|
|
||||||
|
ifeq ($(HAVE_BUILDDEFS), yes)
|
||||||
|
include $(BUILDRULES)
|
||||||
32
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch
vendored
Normal file
32
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-4.5.0-linguas.patch
vendored
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From 2212e8bb59e7c3930d49da2ec5f4f0a9ceb086c7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
Date: Fri, 8 Apr 2016 16:41:31 -0400
|
||||||
|
Subject: [PATCH] po: respect LINGUAS build setting
|
||||||
|
|
||||||
|
It is common gettext practice to limit the translations a particular
|
||||||
|
package will include by setting the LINGUAS environment variable.
|
||||||
|
|
||||||
|
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
---
|
||||||
|
po/Makefile | 5 ++++-
|
||||||
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/po/Makefile b/po/Makefile
|
||||||
|
index edf92ad..a5250b3 100644
|
||||||
|
--- a/po/Makefile
|
||||||
|
+++ b/po/Makefile
|
||||||
|
@@ -6,7 +6,10 @@ TOPDIR = ..
|
||||||
|
include $(TOPDIR)/include/builddefs
|
||||||
|
|
||||||
|
POTHEAD = $(PKG_NAME).pot
|
||||||
|
-LINGUAS = de pl
|
||||||
|
+# If the user has requested a specific set of translations, only build those.
|
||||||
|
+SUPPORTED_LINGUAS = $(patsubst %.po,%,$(wildcard *.po))
|
||||||
|
+LINGUAS ?= $(SUPPORTED_LINGUAS)
|
||||||
|
+LINGUAS := $(filter $(SUPPORTED_LINGUAS),$(LINGUAS))
|
||||||
|
LSRCFILES = $(LINGUAS:%=%.po)
|
||||||
|
LDIRT = $(POTHEAD)
|
||||||
|
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
From d01d3689fd512811b9d860598ddf26089bb5955c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
Date: Tue, 9 Aug 2016 22:37:45 +0800
|
||||||
|
Subject: [PATCH xfsprogs] libxcmd: link against used libs
|
||||||
|
|
||||||
|
Since this lib uses symbols from libxfs (platform_findsizes) and many
|
||||||
|
symbols from libblkid, link against both. Otherwise, the resulting
|
||||||
|
shared lib has missing symbols which makes linking against annoying.
|
||||||
|
|
||||||
|
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
---
|
||||||
|
libxcmd/Makefile | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/libxcmd/Makefile b/libxcmd/Makefile
|
||||||
|
index aab8d6d63624..46ba138a37e2 100644
|
||||||
|
--- a/libxcmd/Makefile
|
||||||
|
+++ b/libxcmd/Makefile
|
||||||
|
@@ -12,6 +12,8 @@ LT_AGE = 0
|
||||||
|
|
||||||
|
CFILES = command.c input.c paths.c projects.c help.c quit.c topology.c
|
||||||
|
|
||||||
|
+LTLIBS = $(LIBXFS) $(LIBBLKID)
|
||||||
|
+
|
||||||
|
ifeq ($(HAVE_GETMNTENT),yes)
|
||||||
|
LCFLAGS += -DHAVE_GETMNTENT
|
||||||
|
endif
|
||||||
|
--
|
||||||
|
2.9.0
|
||||||
|
|
||||||
@ -0,0 +1,81 @@
|
|||||||
|
--- xfsprogs-4.7.0/include/buildmacros
|
||||||
|
+++ xfsprogs-4.7.0/include/buildmacros
|
||||||
|
@@ -70,18 +70,9 @@
|
||||||
|
# /usr/lib.
|
||||||
|
ifeq ($(ENABLE_SHARED),yes)
|
||||||
|
INSTALL_LTLIB_DEV = \
|
||||||
|
- cd $(TOPDIR)/$(LIBNAME)/.libs; \
|
||||||
|
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
|
||||||
|
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
|
||||||
|
- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
|
||||||
|
- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
|
||||||
|
- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
|
||||||
|
- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
|
||||||
|
- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
|
||||||
|
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
|
||||||
|
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
|
||||||
|
- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
|
||||||
|
- fi
|
||||||
|
+ set -e; cd $(TOPDIR)/$(LIBNAME); \
|
||||||
|
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
|
||||||
|
+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
|
||||||
|
else
|
||||||
|
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
|
||||||
|
endif
|
||||||
|
--- xfsprogs-4.7.0/libhandle/Makefile
|
||||||
|
+++ xfsprogs-4.7.0/libhandle/Makefile
|
||||||
|
@@ -24,7 +24,6 @@
|
||||||
|
include $(BUILDRULES)
|
||||||
|
|
||||||
|
install: default
|
||||||
|
- $(INSTALL_LTLIB)
|
||||||
|
|
||||||
|
install-dev: default
|
||||||
|
$(INSTALL_LTLIB_DEV)
|
||||||
|
--- xfsprogs-4.7.0/libxcmd/Makefile
|
||||||
|
+++ xfsprogs-4.7.0/libxcmd/Makefile
|
||||||
|
@@ -34,6 +34,9 @@
|
||||||
|
|
||||||
|
include $(BUILDRULES)
|
||||||
|
|
||||||
|
-install install-dev: default
|
||||||
|
+install: default
|
||||||
|
+
|
||||||
|
+install-dev: default
|
||||||
|
+ $(INSTALL_LTLIB_DEV)
|
||||||
|
|
||||||
|
-include .ltdep
|
||||||
|
--- xfsprogs-4.7.0/libxfs/Makefile
|
||||||
|
+++ xfsprogs-4.7.0/libxfs/Makefile
|
||||||
|
@@ -138,6 +138,7 @@
|
||||||
|
|
||||||
|
install-dev: install
|
||||||
|
$(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
|
||||||
|
+ $(INSTALL_LTLIB_DEV)
|
||||||
|
|
||||||
|
# We need to install the headers before building the dependencies. If we
|
||||||
|
# include the .ltdep file, the makefile decides that it needs to build the
|
||||||
|
--- xfsprogs-4.7.0/libxlog/Makefile
|
||||||
|
+++ xfsprogs-4.7.0/libxlog/Makefile
|
||||||
|
@@ -19,6 +21,9 @@
|
||||||
|
|
||||||
|
include $(BUILDRULES)
|
||||||
|
|
||||||
|
-install install-dev: default
|
||||||
|
+install: default
|
||||||
|
+
|
||||||
|
+install-dev: default
|
||||||
|
+ $(INSTALL_LTLIB_DEV)
|
||||||
|
|
||||||
|
-include .ltdep
|
||||||
|
--- xfsprogs-4.7.0/Makefile
|
||||||
|
+++ xfsprogs-4.7.0/Makefile
|
||||||
|
@@ -83,6 +83,8 @@
|
||||||
|
repair: libxlog libxcmd
|
||||||
|
copy: libxlog
|
||||||
|
mkfs: libxcmd
|
||||||
|
+libxlog: libxfs
|
||||||
|
+libxlog-install-dev: libxfs-install-dev
|
||||||
|
|
||||||
|
ifeq ($(HAVE_BUILDDEFS), yes)
|
||||||
|
include $(BUILDRULES)
|
||||||
@ -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
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
libxfs/Makefile | 2 +-
|
||||||
|
libxlog/Makefile | 2 ++
|
||||||
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libxfs/Makefile b/libxfs/Makefile
|
||||||
|
index 6499731..00447c4 100644
|
||||||
|
--- a/libxfs/Makefile
|
||||||
|
+++ b/libxfs/Makefile
|
||||||
|
@@ -113,7 +113,7 @@ LSRCFILES += gen_crc32table.c
|
||||||
|
|
||||||
|
FCFLAGS = -I.
|
||||||
|
|
||||||
|
-LTLIBS = $(LIBPTHREAD) $(LIBRT)
|
||||||
|
+LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID)
|
||||||
|
|
||||||
|
# don't try linking xfs_repair with a debug libxfs.
|
||||||
|
DEBUG = -DNDEBUG
|
||||||
|
diff --git a/libxlog/Makefile b/libxlog/Makefile
|
||||||
|
index 3417eed..fda1343 100644
|
||||||
|
--- a/libxlog/Makefile
|
||||||
|
+++ b/libxlog/Makefile
|
||||||
|
@@ -12,6 +12,8 @@ LT_AGE = 0
|
||||||
|
|
||||||
|
CFILES = xfs_log_recover.c util.c
|
||||||
|
|
||||||
|
+LTLIBS = $(LIBUUID)
|
||||||
|
+
|
||||||
|
# don't want to link xfs_repair with a debug libxlog.
|
||||||
|
DEBUG = -DNDEBUG
|
||||||
|
|
||||||
8
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/metadata.xml
vendored
Normal file
8
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/metadata.xml
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||||
|
<pkgmetadata>
|
||||||
|
<maintainer type="project">
|
||||||
|
<email>base-system@gentoo.org</email>
|
||||||
|
<name>Gentoo Base System</name>
|
||||||
|
</maintainer>
|
||||||
|
</pkgmetadata>
|
||||||
103
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild
vendored
Normal file
103
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild
vendored
Normal file
@ -0,0 +1,103 @@
|
|||||||
|
# Copyright 1999-2016 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Id$
|
||||||
|
|
||||||
|
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"
|
||||||
|
|
||||||
|
LICENSE="LGPL-2.1"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
|
||||||
|
IUSE="libedit nls readline static static-libs"
|
||||||
|
REQUIRED_USE="static? ( static-libs )"
|
||||||
|
|
||||||
|
LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
|
||||||
|
readline? ( sys-libs/readline:0=[static-libs(+)] )
|
||||||
|
!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
|
||||||
|
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
|
||||||
|
!<sys-fs/xfsdump-3"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
static? (
|
||||||
|
${LIB_DEPEND}
|
||||||
|
readline? ( sys-libs/ncurses:0=[static-libs] )
|
||||||
|
)
|
||||||
|
nls? ( sys-devel/gettext )"
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/${PN}-4.3.0-sharedlibs.patch
|
||||||
|
"${FILESDIR}"/${PN}-4.5.0-linguas.patch
|
||||||
|
"${FILESDIR}"/${PN}-4.3.0-cross-compile.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
if use readline && use libedit ; then
|
||||||
|
ewarn "You have USE='readline libedit' but these are exclusive."
|
||||||
|
ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
epatch "${PATCHES[@]}"
|
||||||
|
|
||||||
|
# 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.
|
||||||
|
sed -i \
|
||||||
|
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
|
||||||
|
-e "1iLLDFLAGS += $(usex static '-all-static' '')" \
|
||||||
|
include/builddefs.in || die
|
||||||
|
find -name Makefile -exec \
|
||||||
|
sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
|
||||||
|
|
||||||
|
# libdisk has broken blkid conditional checking
|
||||||
|
sed -i \
|
||||||
|
-e '/LIB_SUBDIRS/s:libdisk::' \
|
||||||
|
Makefile || die
|
||||||
|
|
||||||
|
# TODO: write a patch for configure.in to use pkg-config for the uuid-part
|
||||||
|
if use static && use readline ; then
|
||||||
|
sed -i \
|
||||||
|
-e 's|-lreadline|\0 -lncurses|' \
|
||||||
|
-e 's|-lblkid|\0 -luuid|' \
|
||||||
|
configure || die
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
export DEBUG=-DNDEBUG
|
||||||
|
export OPTIMIZER=${CFLAGS}
|
||||||
|
unset PLATFORM # if set in user env, this breaks configure
|
||||||
|
|
||||||
|
local myconf
|
||||||
|
if use static || use static-libs ; then
|
||||||
|
myconf+=" --enable-static"
|
||||||
|
else
|
||||||
|
myconf+=" --disable-static"
|
||||||
|
fi
|
||||||
|
|
||||||
|
econf \
|
||||||
|
--bindir=/usr/bin \
|
||||||
|
--libexecdir=/usr/$(get_libdir) \
|
||||||
|
$(use_enable nls gettext) \
|
||||||
|
$(use_enable readline) \
|
||||||
|
$(usex readline --disable-editline $(use_enable libedit editline)) \
|
||||||
|
${myconf}
|
||||||
|
|
||||||
|
MAKEOPTS+=" V=1"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
emake DIST_ROOT="${ED}" install
|
||||||
|
# parallel install fails on this target for >=xfsprogs-3.2.0
|
||||||
|
emake -j1 DIST_ROOT="${ED}" install-dev
|
||||||
|
|
||||||
|
# handle is for xfsdump, the rest for xfsprogs
|
||||||
|
gen_usr_ldscript -a xfs xlog
|
||||||
|
# removing unnecessary .la files if not needed
|
||||||
|
use static-libs || find "${ED}" -name '*.la' -delete
|
||||||
|
}
|
||||||
96
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.7.0.ebuild
vendored
Normal file
96
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.7.0.ebuild
vendored
Normal file
@ -0,0 +1,96 @@
|
|||||||
|
# Copyright 1999-2016 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Id$
|
||||||
|
|
||||||
|
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"
|
||||||
|
|
||||||
|
LICENSE="LGPL-2.1"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||||
|
IUSE="libedit nls readline static static-libs"
|
||||||
|
REQUIRED_USE="static? ( static-libs )"
|
||||||
|
|
||||||
|
LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
|
||||||
|
readline? ( sys-libs/readline:0=[static-libs(+)] )
|
||||||
|
!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
|
||||||
|
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
|
||||||
|
!<sys-fs/xfsdump-3"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
static? (
|
||||||
|
${LIB_DEPEND}
|
||||||
|
readline? ( sys-libs/ncurses:0=[static-libs] )
|
||||||
|
)
|
||||||
|
nls? ( sys-devel/gettext )"
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/${PN}-4.7.0-sharedlibs.patch
|
||||||
|
"${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
|
||||||
|
"${FILESDIR}"/${PN}-4.3.0-cross-compile.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
if use readline && use libedit ; then
|
||||||
|
ewarn "You have USE='readline libedit' but these are exclusive."
|
||||||
|
ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
epatch "${PATCHES[@]}"
|
||||||
|
|
||||||
|
# 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.
|
||||||
|
sed -i \
|
||||||
|
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
|
||||||
|
-e "1iLLDFLAGS += $(usex static '-all-static' '')" \
|
||||||
|
include/builddefs.in || die
|
||||||
|
find -name Makefile -exec \
|
||||||
|
sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
|
||||||
|
|
||||||
|
# TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
|
||||||
|
if use static && use readline ; then
|
||||||
|
sed -i \
|
||||||
|
-e 's|-lreadline|& -lncurses|' \
|
||||||
|
-e 's|-lblkid|& -luuid|' \
|
||||||
|
configure || die
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
export DEBUG=-DNDEBUG
|
||||||
|
export OPTIMIZER=${CFLAGS}
|
||||||
|
unset PLATFORM # if set in user env, this breaks configure
|
||||||
|
|
||||||
|
local myconf
|
||||||
|
if use static || use static-libs ; then
|
||||||
|
myconf+=" --enable-static"
|
||||||
|
else
|
||||||
|
myconf+=" --disable-static"
|
||||||
|
fi
|
||||||
|
|
||||||
|
econf \
|
||||||
|
$(use_enable nls gettext) \
|
||||||
|
$(use_enable readline) \
|
||||||
|
$(usex readline --disable-editline $(use_enable libedit editline)) \
|
||||||
|
${myconf}
|
||||||
|
|
||||||
|
MAKEOPTS+=" V=1"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
emake DIST_ROOT="${ED}" install
|
||||||
|
# parallel install fails on this target for >=xfsprogs-3.2.0
|
||||||
|
emake -j1 DIST_ROOT="${ED}" install-dev
|
||||||
|
|
||||||
|
# handle is for xfsdump, the rest for xfsprogs
|
||||||
|
gen_usr_ldscript -a handle xcmd xfs xlog
|
||||||
|
# removing unnecessary .la files if not needed
|
||||||
|
use static-libs || find "${ED}" -name '*.la' -delete
|
||||||
|
}
|
||||||
95
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.8.0.ebuild
vendored
Normal file
95
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.8.0.ebuild
vendored
Normal file
@ -0,0 +1,95 @@
|
|||||||
|
# Copyright 1999-2016 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Id$
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
inherit eutils toolchain-funcs multilib
|
||||||
|
|
||||||
|
DESCRIPTION="xfs filesystem utilities"
|
||||||
|
HOMEPAGE="http://oss.sgi.com/projects/xfs/"
|
||||||
|
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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||||
|
IUSE="libedit nls readline static static-libs"
|
||||||
|
REQUIRED_USE="static? ( static-libs )"
|
||||||
|
|
||||||
|
LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
|
||||||
|
readline? ( sys-libs/readline:0=[static-libs(+)] )
|
||||||
|
!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
|
||||||
|
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
|
||||||
|
!<sys-fs/xfsdump-3"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
static? (
|
||||||
|
${LIB_DEPEND}
|
||||||
|
readline? ( sys-libs/ncurses:0=[static-libs] )
|
||||||
|
)
|
||||||
|
nls? ( sys-devel/gettext )"
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/${PN}-4.7.0-sharedlibs.patch
|
||||||
|
"${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
|
||||||
|
"${FILESDIR}"/${PN}-4.3.0-cross-compile.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
if use readline && use libedit ; then
|
||||||
|
ewarn "You have USE='readline libedit' but these are exclusive."
|
||||||
|
ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
epatch "${PATCHES[@]}"
|
||||||
|
|
||||||
|
# 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.
|
||||||
|
sed -i \
|
||||||
|
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
|
||||||
|
-e "1iLLDFLAGS += $(usex static '-all-static' '')" \
|
||||||
|
include/builddefs.in || die
|
||||||
|
find -name Makefile -exec \
|
||||||
|
sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
|
||||||
|
|
||||||
|
# TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
|
||||||
|
if use static && use readline ; then
|
||||||
|
sed -i \
|
||||||
|
-e 's|-lreadline|& -lncurses|' \
|
||||||
|
-e 's|-lblkid|& -luuid|' \
|
||||||
|
configure || die
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
export DEBUG=-DNDEBUG
|
||||||
|
export OPTIMIZER=${CFLAGS}
|
||||||
|
unset PLATFORM # if set in user env, this breaks configure
|
||||||
|
|
||||||
|
local myconf
|
||||||
|
if use static || use static-libs ; then
|
||||||
|
myconf+=" --enable-static"
|
||||||
|
else
|
||||||
|
myconf+=" --disable-static"
|
||||||
|
fi
|
||||||
|
|
||||||
|
econf \
|
||||||
|
$(use_enable nls gettext) \
|
||||||
|
$(use_enable readline) \
|
||||||
|
$(usex readline --disable-editline $(use_enable libedit editline)) \
|
||||||
|
${myconf}
|
||||||
|
|
||||||
|
MAKEOPTS+=" V=1"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
emake DIST_ROOT="${ED}" install
|
||||||
|
# parallel install fails on this target for >=xfsprogs-3.2.0
|
||||||
|
emake -j1 DIST_ROOT="${ED}" install-dev
|
||||||
|
|
||||||
|
# handle is for xfsdump, the rest for xfsprogs
|
||||||
|
gen_usr_ldscript -a handle xcmd xfs xlog
|
||||||
|
# removing unnecessary .la files if not needed
|
||||||
|
use static-libs || find "${ED}" -name '*.la' -delete
|
||||||
|
}
|
||||||
96
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
vendored
Normal file
96
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
vendored
Normal file
@ -0,0 +1,96 @@
|
|||||||
|
# Copyright 1999-2017 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Id$
|
||||||
|
|
||||||
|
EAPI=5
|
||||||
|
|
||||||
|
inherit eutils toolchain-funcs multilib
|
||||||
|
|
||||||
|
DESCRIPTION="xfs filesystem utilities"
|
||||||
|
HOMEPAGE="http://oss.sgi.com/projects/xfs/"
|
||||||
|
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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||||
|
IUSE="libedit nls readline static static-libs"
|
||||||
|
REQUIRED_USE="static? ( static-libs )"
|
||||||
|
|
||||||
|
LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
|
||||||
|
readline? ( sys-libs/readline:0=[static-libs(+)] )
|
||||||
|
!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
|
||||||
|
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
|
||||||
|
!<sys-fs/xfsdump-3"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
static? (
|
||||||
|
${LIB_DEPEND}
|
||||||
|
readline? ( sys-libs/ncurses:0=[static-libs] )
|
||||||
|
)
|
||||||
|
nls? ( sys-devel/gettext )"
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/${PN}-4.7.0-sharedlibs.patch
|
||||||
|
"${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
|
||||||
|
"${FILESDIR}"/${PN}-4.9.0-cross-compile.patch
|
||||||
|
"${FILESDIR}"/${P}-underlinking.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
if use readline && use libedit ; then
|
||||||
|
ewarn "You have USE='readline libedit' but these are exclusive."
|
||||||
|
ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
epatch "${PATCHES[@]}"
|
||||||
|
|
||||||
|
# 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.
|
||||||
|
sed -i \
|
||||||
|
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
|
||||||
|
-e "1iLLDFLAGS += $(usex static '-all-static' '')" \
|
||||||
|
include/builddefs.in || die
|
||||||
|
find -name Makefile -exec \
|
||||||
|
sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
|
||||||
|
|
||||||
|
# TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
|
||||||
|
if use static && use readline ; then
|
||||||
|
sed -i \
|
||||||
|
-e 's|-lreadline|& -lncurses|' \
|
||||||
|
-e 's|-lblkid|& -luuid|' \
|
||||||
|
configure || die
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
export DEBUG=-DNDEBUG
|
||||||
|
export OPTIMIZER=${CFLAGS}
|
||||||
|
unset PLATFORM # if set in user env, this breaks configure
|
||||||
|
|
||||||
|
local myconf
|
||||||
|
if use static || use static-libs ; then
|
||||||
|
myconf+=" --enable-static"
|
||||||
|
else
|
||||||
|
myconf+=" --disable-static"
|
||||||
|
fi
|
||||||
|
|
||||||
|
econf \
|
||||||
|
$(use_enable nls gettext) \
|
||||||
|
$(use_enable readline) \
|
||||||
|
$(usex readline --disable-editline $(use_enable libedit editline)) \
|
||||||
|
${myconf}
|
||||||
|
|
||||||
|
MAKEOPTS+=" V=1"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
emake DIST_ROOT="${ED}" install
|
||||||
|
# parallel install fails on this target for >=xfsprogs-3.2.0
|
||||||
|
emake -j1 DIST_ROOT="${ED}" install-dev
|
||||||
|
|
||||||
|
# handle is for xfsdump, the rest for xfsprogs
|
||||||
|
gen_usr_ldscript -a handle xcmd xfs xlog
|
||||||
|
# removing unnecessary .la files if not needed
|
||||||
|
use static-libs || find "${ED}" -name '*.la' -delete
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user