diff options
Diffstat (limited to 'sys-fs/xfsprogs')
-rw-r--r-- | sys-fs/xfsprogs/Manifest | 8 | ||||
-rw-r--r-- | sys-fs/xfsprogs/files/xfsprogs-4.7.0-sharedlibs.patch | 81 | ||||
-rw-r--r-- | sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch | 143 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-4.16.0.ebuild | 96 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-4.16.1.ebuild | 1 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild | 95 |
6 files changed, 2 insertions, 422 deletions
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 24a7293592b9..2266e5d9fc2b 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -2,17 +2,11 @@ AUX xfsprogs-4.12.0-sharedlibs.patch 2361 BLAKE2B 3e487d35a858aa4adfdd41a853dab7 AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b1953ded3cd211ca7fc4235cfc59c2eeb6cf2474e79378782696a9feb324a5c32e541873d8493ff019adfe1ff006c2 SHA512 f6492ab8b4f8a417752a0b38538e0fdc06808968df07ecc5d752261cbc11d683acdd0e83ebf2744ea0068a5216f817a3816029cbf74da91c8eccf391574b931e AUX xfsprogs-4.15.0-sharedlibs.patch 3022 BLAKE2B cfa23520a55750af375ada8c35fb9f4b3ea2f401ddebd95aef6d46f9195ac6ab3fb38f5f9d08529d3c2658623a49eadc7db0be68159753025310605fdfc35a6b SHA512 5a6e62f2914e372f2bf679b10c32fe65f60677b4bf0e58f60c40a297ed8974d5ec0af3bcba5801ba19cadbb689a6dad62c1e2cd88587f6f3d30f21f1472f3ac0 AUX xfsprogs-4.7.0-libxcmd-link.patch 880 BLAKE2B 5c9911aed7bd1579d17aac75f74ff41221e9e7c1d1c2139af4785d570ac612bb338cdcfa246ba690a60a2244ad14d7aa4885bf3d1306cecbf9326c2ff048604f SHA512 4484570c4bb387b6dfde5f31d8527f2222d33e120c365e3cbc6f488403b9e9d969d3f2a883ffcb145a11d57ace70c76fb1ba4a8ed75533f2089a197d463c8dd9 -AUX xfsprogs-4.7.0-sharedlibs.patch 2355 BLAKE2B 03d1dfd738b973d9f904cec83528e6c61f9ebc8090c05ed8e51dc709185196f22b6db416d548fd0fd35296934177660a9d864881d07511f43287d647c392e4ae SHA512 f0006ec0a987e44a1e60d642f9938d35c14ccb765c6a040c80e483a0e073e54608571b53793b7d4c2b9eb1f5c4e2f077fb713dfab9abaa99022d24d8a17443fe -AUX xfsprogs-4.9.0-cross-compile.patch 3663 BLAKE2B 1fdbc4307c0b177428e5b016321c791736c4cf0dfdfe19a413f0bb20d4f866b5bebe165c58b30132fadef078f5de7cbded1e310bc6871fb65559d00b2ae107fe SHA512 150ebcc26b21eb3e52575dd6b4bf2f451abb4906071b66e79df3697a56345e178f6b9bb11a7bd19283adb47a6b5e9c1dd807775ac2c814f0e2db795788fd1159 AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13fe3d217a6c4c8dd21fce1986793cefaa4777e827945adb3807f2d644665fbf66e7fbd5318d6f5c58d37c49260c24ca46181 SHA512 2fcbaab48ca33cd2e8724cdc55d814a970beb5127c861f4b829ede9f501516733c6dabbfe0bfb1d23df01bb69538af5ca31eb403030e3d2ad9efd8643c509ac7 DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4ba233a50f1f1ff41eaf0dcd039ae290f1e49b385da19ceff3a34e770f90943502eefd7c1469c5cba74f45185fd07e SHA512 69832a1b9636dc5a77ad277122bb24bc09c71ad743c3ab5bf830d398557e63fa1477dd08c6115a53a94f01fc27e58d70268416013cc25e026baed7a74af8d506 DIST xfsprogs-4.15.1.tar.xz 1188964 BLAKE2B 7b4d1d2f71a0678f9246045e576262d6f3b3c59322e0b33b37dc46d84cdf5407a4b2fd6f2b99dd7647e9bfe9fe312fefe8162013dec9162f3a071421323aa52d SHA512 4ec3f0438f33322f0ff6e5acb27cbb554ab48df3ae0ef11071992b085016f84b49ca7bdbaf3a6859427877ea9c419bcd37ac3058914d67409ba2d65e586508ee -DIST xfsprogs-4.16.0.tar.xz 1199088 BLAKE2B 1de05747164eb695c10644f05845507b0a2daf55563af13b3177588af4114d40c0e72bbfee4cc47aaf86840f648d4fc34837797975aed3490321a1122f86e277 SHA512 0ca0cb3347ccc103f92f496016beaf5e5742fea2a4ca8515f6e340537e446df09483d9d30ce159789eb05a73430f8d517e57d1a8548029f1e73c108484b4e6e8 DIST xfsprogs-4.16.1.tar.xz 1199632 BLAKE2B 26448ce8ec691d117c0b41aebcb692994ad5a65418ac5af9631eab75191201a265ec9bce92d4076049a4182a879741329f20e5f54343afeef826cf1dfbfcf0d1 SHA512 d3cf3b07e07864341c351a078736ff7c721d86c177e65f131dc6e023cade74a5e07fecbc435d69946d76d587b138e66cddcd763954e15ed0dd17c056a83e2a19 -DIST xfsprogs-4.9.0.tar.xz 1087940 BLAKE2B f896a1248e978b4d7c879c91e73f16fd5894cb95c22143e2f805ab2f54b75cafef63cd574fbf3ccbaebb59914b3759a1f8b3a49790c8c05df145d01416723c62 SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7 EBUILD xfsprogs-4.14.0.ebuild 2660 BLAKE2B 04e627acc5c922886524a97463c8da7b56995a12795a2b91bb71f7390bb9c1e7adc55a6ce7c473e819656bab696a6abba5f033b07e9dfec6e8826a4dd1ec730d SHA512 384017672d412e9e27fea265ce818e848c37aa8989c613d2b6849680a00e595bbc79f4fc08f3554da3a29a755122d86fa4ad943af14c2371f2c9fbd93303df36 EBUILD xfsprogs-4.15.1.ebuild 2778 BLAKE2B 030c61740f4afadb66a9b2bd092a20b5670ac89634fd266289b94e8f0279c7b1890cfd83f907a8d4d3dd8e4658def5b4a8c67f7fdd83e0ab9f0faee65501a1ec SHA512 72a8a669e0b343ae3f8b3ba1ba1d0bcb022a7cefcf3151dda4cfb0cd1cd67a797783b837f3c18fcf61c6e5b6244dee021af1b181d3abb7d26c7f534a932e80a0 -EBUILD xfsprogs-4.16.0.ebuild 2778 BLAKE2B 030c61740f4afadb66a9b2bd092a20b5670ac89634fd266289b94e8f0279c7b1890cfd83f907a8d4d3dd8e4658def5b4a8c67f7fdd83e0ab9f0faee65501a1ec SHA512 72a8a669e0b343ae3f8b3ba1ba1d0bcb022a7cefcf3151dda4cfb0cd1cd67a797783b837f3c18fcf61c6e5b6244dee021af1b181d3abb7d26c7f534a932e80a0 -EBUILD xfsprogs-4.16.1.ebuild 2778 BLAKE2B 030c61740f4afadb66a9b2bd092a20b5670ac89634fd266289b94e8f0279c7b1890cfd83f907a8d4d3dd8e4658def5b4a8c67f7fdd83e0ab9f0faee65501a1ec SHA512 72a8a669e0b343ae3f8b3ba1ba1d0bcb022a7cefcf3151dda4cfb0cd1cd67a797783b837f3c18fcf61c6e5b6244dee021af1b181d3abb7d26c7f534a932e80a0 -EBUILD xfsprogs-4.9.0.ebuild 2717 BLAKE2B f24db0e5c16988192a849e6d42a143e103adb7569dba8a96cb5c6ac08d97663f9259c5b31073f2940b9a2e971c850b7ca200945f1bbd86f879a7a26d2e11f30b SHA512 b604adb4f3e3cbdf8e35d44d53e1c24d6be61552e0f4c14762d2f9f706d33a29226cbd30b11079faa2ecbea35ed85b45fe7908c2f0c9886dd698e2e607ddfe6a +EBUILD xfsprogs-4.16.1.ebuild 2802 BLAKE2B 0cecb91cd67fe8e84e9661c0fd60082fe4429d1425410c6a0fe1f280e51f106f86f8e088ea4cfdc7c5c4bc9c7ba3fae73883fcb14e7e4afe2c1625522b2df843 SHA512 8e251450ab8123c558f7891d8bba1fa49ce928bca86e19d2e44ea396b617b0c63e26b3b65d54ef2643a64a0d6d4a12ee6247e1b90bc62bb5a04f3cfb4dc6b411 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1 diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.7.0-sharedlibs.patch deleted file mode 100644 index b5395ffaed6c..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-sharedlibs.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- 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) 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 deleted file mode 100644 index fade1028301d..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch +++ /dev/null @@ -1,143 +0,0 @@ ---- 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/xfsprogs-4.16.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.16.0.ebuild deleted file mode 100644 index 148d4aa1cf89..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-4.16.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs multilib systemd - -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" - -LICENSE="LGPL-2.1" -SLOT="0" -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 )" - -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.9.0-underlinking.patch - "${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch - "${FILESDIR}"/${PN}-4.15.0-docdir.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() { - 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. - 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=( - --with-crond-dir="${EPREFIX}/etc/cron.d" - --with-systemd-unit-dir="$(systemd_get_systemunitdir)" - $(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 ) - else - myconf+=( --disable-static ) - fi - - econf "${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 frog - # removing unnecessary .la files if not needed - use static-libs || find "${ED}" -name '*.la' -delete -} diff --git a/sys-fs/xfsprogs/xfsprogs-4.16.1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.16.1.ebuild index 148d4aa1cf89..aa533b7984f3 100644 --- a/sys-fs/xfsprogs/xfsprogs-4.16.1.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-4.16.1.ebuild @@ -67,6 +67,7 @@ src_configure() { unset PLATFORM # if set in user env, this breaks configure local myconf=( + --disable-lto #655638 --with-crond-dir="${EPREFIX}/etc/cron.d" --with-systemd-unit-dir="$(systemd_get_systemunitdir)" $(use_enable nls gettext) diff --git a/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild deleted file mode 100644 index 4dca309b8b99..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -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" - -LICENSE="LGPL-2.1" -SLOT="0" -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 )" - -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 -} |