diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2014-12-15 10:01:53 +0000 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-12-15 10:01:53 +0000 |
commit | 3491d1b1af4c5912e93fdf48e47c8526bbf401af (patch) | |
tree | b04aa980b35171e479c4acdb213c8154bc7f31c3 /sys-fs/xfsprogs | |
parent | Version bump. Removed old (diff) | |
download | gentoo-2-3491d1b1af4c5912e93fdf48e47c8526bbf401af.tar.gz gentoo-2-3491d1b1af4c5912e93fdf48e47c8526bbf401af.tar.bz2 gentoo-2-3491d1b1af4c5912e93fdf48e47c8526bbf401af.zip |
Version bump
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'sys-fs/xfsprogs')
-rw-r--r-- | sys-fs/xfsprogs/ChangeLog | 8 | ||||
-rw-r--r-- | sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch | 108 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-3.2.2.ebuild | 98 |
3 files changed, 213 insertions, 1 deletions
diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog index 859e9005cd3f..c299052e9942 100644 --- a/sys-fs/xfsprogs/ChangeLog +++ b/sys-fs/xfsprogs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/xfsprogs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.177 2014/11/11 10:46:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.178 2014/12/15 10:01:52 polynomial-c Exp $ + +*xfsprogs-3.2.2 (15 Dec 2014) + + 15 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> +xfsprogs-3.2.2.ebuild, + +files/xfsprogs-3.2.2-sharedlibs.patch: + Version bump. 11 Nov 2014; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.2.1.ebuild: Stable for ia64, wrt bug #524374 diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch new file mode 100644 index 000000000000..118874a5e998 --- /dev/null +++ b/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch @@ -0,0 +1,108 @@ +use libtool to do all installing. do not use the manual file install as +that'll copy files directly from the .libs/ subdir which might have rpaths +that we do not want. + +--- xfsprogs-3.2.2/include/buildmacros ++++ xfsprogs-3.2.2/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-3.2.2/libdisk/Makefile ++++ xfsprogs-3.2.2/libdisk/Makefile +@@ -31,6 +31,7 @@ + install: default + + install-dev: default ++ $(INSTALL_LTLIB_DEV) + + install-qa: install-dev + +--- xfsprogs-3.2.2/libhandle/Makefile ++++ xfsprogs-3.2.2/libhandle/Makefile +@@ -20,7 +20,6 @@ + include $(BUILDRULES) + + install: default +- $(INSTALL_LTLIB) + + install-dev: default + $(INSTALL_LTLIB_DEV) +--- xfsprogs-3.2.2/libxcmd/Makefile ++++ xfsprogs-3.2.2/libxcmd/Makefile +@@ -34,6 +34,11 @@ + + include $(BUILDRULES) + +-install install-dev install-qa: default ++install: default ++ ++ install-dev: default ++ $(INSTALL_LTLIB_DEV) ++ ++install-qa: default + + -include .ltdep +--- xfsprogs-3.2.2/libxfs/Makefile ++++ xfsprogs-3.2.2/libxfs/Makefile +@@ -86,6 +86,7 @@ + install: default + + install-dev: default ++ $(INSTALL_LTLIB_DEV) + + install-qa: default + +--- xfsprogs-3.2.2/libxlog/Makefile ++++ xfsprogs-3.2.2/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,11 @@ + + include $(BUILDRULES) + +-install install-dev install-qa: default ++install: default ++ ++install-dev: default ++ $(INSTALL_LTLIB_DEV) ++ ++install-qa: default + + -include .ltdep +--- xfsprogs-3.2.2/Makefile ++++ xfsprogs-3.2.2/Makefile +@@ -63,6 +63,8 @@ + mkfs: libxfs + quota: libxcmd + repair: libxfs libxlog ++libxlog: libxfs ++libxlog-install-dev: libxfs-install-dev + + ifneq ($(ENABLE_BLKID), yes) + mkfs: libdisk diff --git a/sys-fs/xfsprogs/xfsprogs-3.2.2.ebuild b/sys-fs/xfsprogs/xfsprogs-3.2.2.ebuild new file mode 100644 index 000000000000..bc7d48ef1b9c --- /dev/null +++ b/sys-fs/xfsprogs/xfsprogs-3.2.2.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.2.2.ebuild,v 1.1 2014/12/15 10:01:52 polynomial-c Exp $ + +EAPI="4" + +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[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[static-libs] ) + ) + nls? ( sys-devel/gettext )" + +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 "${FILESDIR}"/${PN}-3.2.2-sharedlibs.patch + + sed -i \ + -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ + include/builddefs.in || die + sed -i \ + -e '1iLLDFLAGS = -static' \ + {estimate,fsr}/Makefile || die + sed -i \ + -e "/LLDFLAGS/s:-static:$(use static && echo -all-static):" \ + $(find -name Makefile) || die + + # 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 these targets for >=xfsprogs-3.2.0 + emake -j1 DIST_ROOT="${ED}" install-{dev,qa} + + # 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 +} |