Bump
Package-Manager: portage-2.2.14 RepoMan-Options: --force
This commit is contained in:
Mario Fetka
parent
ed2c101b95
commit
906a553c0c
|
|
@ -1,7 +1,13 @@
|
|||
# ChangeLog for sys-fs/xfsprogs
|
||||
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
|
||||
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
*xfsprogs-3.2.2 (17 Feb 2015)
|
||||
|
||||
17 Feb 2015; Mario Fetka <mario.fetka@gmail.com>
|
||||
+files/xfsprogs-3.2.2-sharedlibs.patch, +xfsprogs-3.2.2.ebuild:
|
||||
Bump
|
||||
|
||||
*xfsprogs-3.1.11-r1 (25 Dec 2013)
|
||||
|
||||
25 Dec 2013; Mario Fetka <mario.fetka@gmail.com>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
AUX xfsprogs-3.1.11-sharedlibs.patch 2534 SHA256 a38ac3d02a16f5e836aa097096352bc5522f8570c40acd96f391a05612fc392d SHA512 75b33b79b1819d33f1a6a4fca6527f94eb4f37d98c468d6837c26183a9cdce8e62624494325ddca79b569cc7936f5749980e7e22d87c08cb8bb4eb77feb81640 WHIRLPOOL 9fa6e548928bcab9b9daa95c9c59b1f76682b029ca24290d9ee1c9a28a8fd3536b3a952c8648a5ccaee6e5ef800dc7f69e83dc5078c59ba7f649f1273a85e4ad
|
||||
AUX xfsprogs-3.2.2-sharedlibs.patch 2776 SHA256 a687cbd95bdd3948ab50a2d945b5c73197dbf6f2a2b5190071dd67003753fa8b SHA512 cb54e4e1a15e45b801788d0a189c3cdb4a02ff8ad9e3d31814c73532e33a0c47e3b0226179142c9f79a87511eaa89387c30794c1651718e36bf6cd4efbba5f6a WHIRLPOOL 0c42f6194a99372acbc914f71a73217cd29fc9256cd39ae832f245d2526f9bfa7ff3e76c2e2bc0ce6d39d05744c4f8ef8e9b7a6624c0a258014f5c99471a04a2
|
||||
AUX xfsprogs_3.1.7-1drbl.patch 501 SHA256 f8256ff0499556830ba5c2ae3bec58a1434c075b59efbd0a1fe4275f70d652e7 SHA512 d78a9d81850996ccb812ebb13663e5579742ac64e406b6777b2c588a3db8cf6d1ae0ba5445808bc7546f47edfffbb8095c1c2df400186a8408bda4f7ca2bc240 WHIRLPOOL 9431760beaca2a597ed1adf4b3755163fbcc763a951afff5e5bfc9fa4f5852e7c2b35d30c15315385f71643b7db974a232d1f200d800f91a300f6b08c0baccd4
|
||||
DIST xfsprogs-3.1.11.tar.gz 1399833 SHA256 adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be SHA512 6de16f0904709e53e6ceea8239e23b7e109375733fd712fd97bfbbf74ec7f1376147e61d1fbe498f1d5be2148bf8ca233c0577d5b88e9201bfd4bb87e696c28a WHIRLPOOL d52f177d172940e46c813575459917d73042739629f83537932eff38b28a524956484ad6ebbbd2d5d698f1a4b60c1a0f127ca1dd22bba86dcd74c5b94bf51962
|
||||
DIST xfsprogs-3.2.2.tar.gz 1477667 SHA256 1a525ce21dc39d4ad3d775fa3c12c2dd4fb7a85e1e05ddd4530dcf773ed65fab SHA512 6316ce6da87bc3d70c1a887b7c5558b594fa6960105d6a51ad0e8072d5533444f69da174f370907738a15bd50f785f715f71947de916940daf0df2845f4a700e WHIRLPOOL a3e1d57e3dd77f91361ff710306a5579a5d99204849291d6730f672e65febe18a5957646cfcda60d02684a24333dca45f742637256b423a7756d4f28556594cf
|
||||
EBUILD xfsprogs-3.1.11-r1.ebuild 2704 SHA256 3b66513c792a8bcf7923eb9aab891027f9c41cc8a3dddfebb008cf4d160f6a46 SHA512 fe9ca286786e21c1f0bc1b3a6dfb9a242fbc70c1015f6c6ccfa98d4b65d31346ada9d282356bd04a408d66ce280c592783b0ccc7448c612ffc29e0c86e9798c9 WHIRLPOOL 7ab3c4d48ff2aa23f9e14e74b2962d7f453377674e0fde1368a502cd4e5592c73e783a99cad9289efead5b9aa9ffe6edc81b77a3c5aea1e945627a6d4d0b358c
|
||||
MISC ChangeLog 920 SHA256 6d8b98b2b5a78150cf17786ce58bcb6d592a6bad82249e2f9ac76e329e1aad8c SHA512 a53e456d97b01011153af278520a0a6a0534df987ede72b7328d9504bb36c1df6dce4ed693154637728102973b60d6a2ac1df25b17a44815405026a8f3a1d880 WHIRLPOOL 76ee6090c19788257ea93a197750fd5d966c1156612e0ab3f25f45e9d576cf28be131b1dd395a92fd207c7747ffea64a99ff731c5bc7069a3d51bda7acfec443
|
||||
EBUILD xfsprogs-3.2.2.ebuild 2798 SHA256 870e9b7c067c964168e4434aaea81baf08c2cd2b0ab2a888e3b0eb18216169bc SHA512 4143794cba4a7200dca5dc62248f9ab244e6c6ae27a785f729f4f46c1d27ed21990e2a02f60f8fb09c2efdfe5fa336c30cdd6abdf6be4bfa0f186a84553bebf1 WHIRLPOOL e0d11623df605a6b9234d78291995309a2c09c6f0ccf02c4166dcd86180b3cbbcdc8878bffd6997836ab13002cff38744c64a710e65fb4edaf9eb197fd86d362
|
||||
MISC ChangeLog 1076 SHA256 4e0c81177f3945823413ac7813a84c77e5465ebab36e7047ebd978a943b2d8de SHA512 fa20cfe68afd33f9ee0fd59cc0d1ec1356eaacecb4ac8710232657886e4c0e148c41a6767a79bb361883327a646ad4381c886df2b1c576c7f79a787081e4cc23 WHIRLPOOL b19326c0dcc8b477c53ec97ae8ac8e53c100cd47f1c0e7c3baf5887a20fc1cbafebb13afbbe5c8d1208ccefbf529c7e538767e8b267f43d088821214b6f2b934
|
||||
MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
# Copyright 1999-2015 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
|
||||
epatch "${FILESDIR}"/${PN}_3.1.7-1drbl.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
|
||||
}
|
||||
Loading…
Reference in New Issue