diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2018-05-14 10:22:32 +0200 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-05-14 10:23:29 +0200 |
commit | 0c15a67228687ff2f1c1f0c0cf307e17f14fa9bf (patch) | |
tree | 79942906f71aa89a7446fe92210549cd5aba5b43 /sys-fs | |
parent | sys-fs/xfsprogs: Disable lto because it breaks on some arches. (diff) | |
download | gentoo-0c15a67228687ff2f1c1f0c0cf307e17f14fa9bf.tar.gz gentoo-0c15a67228687ff2f1c1f0c0cf307e17f14fa9bf.tar.bz2 gentoo-0c15a67228687ff2f1c1f0c0cf307e17f14fa9bf.zip |
sys-fs/xfsprogs: Removed old.
Package-Manager: Portage-2.3.36, Repoman-2.3.9
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/xfsprogs/Manifest | 2 | ||||
-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.9.0.ebuild | 95 |
5 files changed, 0 insertions, 417 deletions
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 76a39dfdb470..5dec96944b7b 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,5 +1,3 @@ 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 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.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 -} |