bump(sys-fs/xfsprogs): sync with upstream for arm64

Signed-off-by: Geoff Levand <geoff@infradead.org>
This commit is contained in:
Geoff Levand 2015-06-24 12:15:33 -07:00
parent 3044315815
commit e16c54c1f5
5 changed files with 244 additions and 15 deletions

View File

@ -0,0 +1,14 @@
DEFINED_PHASES=configure install prepare setup
DEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3 static? ( >=sys-apps/util-linux-2.17.2[static-libs(+)] readline? ( sys-libs/readline[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses[static-libs] ) ) nls? ( sys-devel/gettext )
DESCRIPTION=xfs filesystem utilities
EAPI=4
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 ) !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-3.2.2.tar.gz ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/xfsprogs-3.2.2.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
_md5_=8db5b6831b4fecdecbfdcb6cfeb216dd

View File

@ -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

View File

@ -3,28 +3,31 @@ Hash: SHA256
AUX xfsprogs-3.1.10-sharedlibs.patch 3196 SHA256 1f43e032cb05286c14eed7afcbd91aa8071f0d6d5a88195910264df3529a6992 SHA512 34a0084b981923ebdc22b425d73663c18aa253a64a2f739d177ef09f21a040c18595341f3fb714221146dba5a3f6fac1add1d385099f4eb5f2a0fea6725e9181 WHIRLPOOL 7ef85484c992b20397335af85fdf5b7e9e4169c8c19aafe6782aa366971e71dc6fa27b934a5d0fc7f1887a7c557b4425872aae373944f379c82f0e1d295cba92
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
DIST xfsprogs-3.1.10.tar.gz 1375721 SHA256 9ec8dc77bf3bc114c3ba89f87316a32e3097efb3e7fc44df23421614bb21aa6c SHA512 c5ff72978e13fc74e4b0e5294d2a7e2efffda088051cd39c7f71629bbc5f9f4c694c4aff6b50e57d60d3bd0c15a90ddd18afc3697336cd8d2429939cc82554bb WHIRLPOOL 9c0f9b36de3314e8add80a20a227ec36cd582cf4f98eafaf55ad5fe14521eceaf9d202c9ac46968f73ce1c97233cbec45d8c421127ff31819f72bf0f9f18276a
DIST xfsprogs-3.1.11.tar.gz 1399833 SHA256 adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be SHA512 6de16f0904709e53e6ceea8239e23b7e109375733fd712fd97bfbbf74ec7f1376147e61d1fbe498f1d5be2148bf8ca233c0577d5b88e9201bfd4bb87e696c28a WHIRLPOOL d52f177d172940e46c813575459917d73042739629f83537932eff38b28a524956484ad6ebbbd2d5d698f1a4b60c1a0f127ca1dd22bba86dcd74c5b94bf51962
DIST xfsprogs-3.2.1.tar.gz 1475624 SHA256 83f8ea4c38fe9f42b9f12cd523519287a9695f2cf4f3064e9e9a839f71185767 SHA512 113fd3d0f98f5e1a747ba3cbb9e4c819e188a8166516560e5d7335e0d6edcf7462345da036c9241ba321ce761835aba85bad291fb58acedfab87a0979ba1e938 WHIRLPOOL 03f007eca16d3e27b75b443eb0c2171be0d18610702116f19b6d0fa28d4a12673a31878ea0c3bd63db6714ecfd5c35e87031bd2346d2d1cdc9595ba591a7c259
DIST xfsprogs-3.2.2.tar.gz 1477667 SHA256 1a525ce21dc39d4ad3d775fa3c12c2dd4fb7a85e1e05ddd4530dcf773ed65fab SHA512 6316ce6da87bc3d70c1a887b7c5558b594fa6960105d6a51ad0e8072d5533444f69da174f370907738a15bd50f785f715f71947de916940daf0df2845f4a700e WHIRLPOOL a3e1d57e3dd77f91361ff710306a5579a5d99204849291d6730f672e65febe18a5957646cfcda60d02684a24333dca45f742637256b423a7756d4f28556594cf
EBUILD xfsprogs-3.1.10.ebuild 2640 SHA256 079803cdd85bfa4a649eedfd0fe0f0922c628530fbbaea1912a050d9bbe314ed SHA512 a5ff440e9dd311385f0d33f8efbf029bbe18edd13c98df475e24063660d56e9464d9a29097695e2587f5c597976ecc996e6d02321552f9d3e54ba838563f357c WHIRLPOOL bb2dff75020ea1189186e562e766a3ae13ec8904343f11fa6603cfb54241ede2894bc3addce5ffc2aac7b320e1fc735c5400b52db772ca907c7757a25722cac6
EBUILD xfsprogs-3.1.11-r1.ebuild 2658 SHA256 d4704ba307d50485ae01dffad7ff21bfe8c06736f5e004e051dd7278326c98dc SHA512 fc5052e0cc6656240323fc0c788cc0ccd6d9ebbd5be084b27534a359d2add6eee6f0a7b45bb18cd15137e715f419154be3256453935aab10a80f286074bbbdeb WHIRLPOOL bebf7ee4d86572e138fcaf23083accba353bcbb573933b33ed55cbfa55f038c235cf69e9374cb9e904fb81d3854139b5b47802c31e6a76b31dc2f2ac987067a7
EBUILD xfsprogs-3.2.1.ebuild 2736 SHA256 aa0b6de647d753d50c9a7fd84a76a928dc44b63591a0d35a9a97aa1e49157722 SHA512 be6891fd25fa582a1b6692c214e925ab2c35e4ac94164b8bbc7e4dcd80875eab36cb76c364714e9c14543722c68af3701747b53a087c4a538dc7c540b5863c6b WHIRLPOOL 3774408759f7c535e5a5cb797773c77de28b3c04fe883090c4104a7c3bea2cdfa8f5a4c234132f8ad3e765633a3f019df16de2aa4646bc2a612330f70b3815d8
MISC ChangeLog 26888 SHA256 d57b9fa755ffa53bf833b398cf364ea25b75bd006fe63ec7b3d2b12da26d3acd SHA512 484bc29ab37dcee8e06bb248a616c4b81d482d9f321eed566040013052df911d5d3628db73d1bea53e4ebb9273a4e738db92ddf5b229e82e7dc608c890c6d510 WHIRLPOOL 8aa353fb6d03240e1267626c5fa730ad4ae3c4929cb6b2cfbabcd88743dab22498792d659152d7ed683ed408f413122fe1ac6eef8576c06f3086c22d28375acb
EBUILD xfsprogs-3.2.2.ebuild 2752 SHA256 6761e25b542a84468af0d74bb33ab389dc549eed19bea2a337c7e71e2f6fcf63 SHA512 1fc5cbd9ee0c693a587dd6c1d125d7194424603af57e5bbd59745431a7d444524c74711294c6725fce714887e1dec309b0e7f05a563f3be9610b84232944dcfc WHIRLPOOL 94bfa06c35ca0d7f422f9ecce013d0ac7e4cf8aa3917ece3fbf33ff6bed223fbbef268c8af956a72878ab3ef671a4129a00d2e4a047f7d4d5fa1aec85c3dc3e0
MISC ChangeLog 27065 SHA256 a0637579839e88d27c78c8ae0d1ff4fc8459bf1001a13df17040020ebc4a8f5f SHA512 2c987b23b3f752fcbe1fa4e17df0b3714edf758ce4b807cc10ae29aac69ee8a6b27909a5c7391d38b1ae8be165f8bf99b71c564b1607044643fe5939f485dd7b WHIRLPOOL d31f96e38bcf1e8fc735c254565776fbe3dcf0fa62a7540a9dc2930c8e9debe17a6fd7951c8128f427292a2d8c5704b721d16d4cd384382bf8f3df8f382fb711
MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBCAAGBQJUYekBAAoJELp701BxlEWfuQsP/Ay58Wp5fJk2YgP6crc49Hs8
/QU9oji0JrtjyVH+RnjUuYpfFqKwpArcE+YMJxtwHTBtdcTefh1n0m9QzmLvhlP7
OkiPhKtF1plgKpl7S85J2HglE4j8sEU8BHmO0ShnoUCTYhDEnapc0hJF3jkUMTzC
3xcr3cXkuHAugrQCoBG1YFFCk/wQi+eLyV2pX2Zj7yZUbQdnNAhFRo75ZYe/doBG
rHgKcBkzhxkya/HzZQdjxOygcFDuDOy+5hv+4dxyxzwc3/dRvZLZPGJ/NjVZ4j7x
7rq6iLuWBUvCs96dw7/EJT6Gnq1P90pGzOs3kZrGCncJSu0g2oZwG6PY23Sjqk0v
yiguRCvVLnMvTBILxLOHIRr+J/2v8cnUWmtTvOmsumS+Zy5cY+MIkr4DiE3+HtnD
b8CO0t96zExi8XH85QWZu4Y+iHF6vjuDVQIqPViA2k1O06a3wPTB7PXghNpQtfS4
P1QSIs/wOrhMMv6AclLkNpbG5EeKoCU00mCdG+z74r1XsCV6GwQkkSTO0oV6OUUp
MEkg2onpt24dx0tSlzmpiqKBU0OLVLnrJEV+tKuEcLs42upmf9GOppbtCeYXaPLf
f6YtkwliqKPypaeRUYXnaK6jRSnoHpuw+1X3VWYTg2UcbPrN9Y1f1JKBRAf6kVPK
By5690HAF9qMPK74G5Xg
=sLrM
iQIcBAEBCAAGBQJUjrGSAAoJEPiazRVxLXTFZJsP/1kgxA94wYJiiHUjaCo4ZlpS
Rtm0mLEKSOWxg40IlWoe/jzBxn6hrCedHOZwgy6NXOIC5IrH9lrv4MDnzNyipNpa
G0p+lSWqcN3uY4AXARhov8VHpKSKyVSjudLZNcniN8epv7LOCEYERafk6PLbu13z
IIC2a/xv8GfLUzEFrnP6csSnqAHrKhOD4tJHBAOtXoqsQxiGBdpHTQUGkC+2NBDs
qOoA7cVIR5i9adKEZ7PII0zjYPb+JPrDE7CS5HWi7yd1RxYKMSKU0lDPAanMDJsp
WNt+056oYvSxtM/ah6GIIlonmP9wZKaShChenBqpLSAJ6nI/j1Wfd2s+S3q8rsAf
6I4RU77qoUvzy5TlKLCMJWyz4LqrWzf/wbd4HH/1nIJf51QpIewKkz2xij1ZAiGX
81ZA7ZO7+mvwhb1jRTHbLCZuw011VcRBPgZNYOBocCBPNCJMWKOBuv53QLlW2bfW
NMNK/I637sDIck9GUDtY4vnbA5PV1YZJDtKbSaL5jIH9NZSyrxvyoOiu95bEAacI
ZVYbo/iWoZTHwBo186FuLMpyChfwIIPBUYH4SVBg1Ps0OpGDLe+ctSwPfqCp9Sah
Q8l9w7JNIDIIzSJECzl1/IZ9u+4Yj7JJ2citmsEXsdScRrSPupra6jQ+22RxM1V+
+CLcmaY9gQ0/O6waUrCV
=wdcd
-----END PGP SIGNATURE-----

View File

@ -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

View File

@ -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
}