Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/
Date: Mon, 19 Aug 2019 18:34:28
Message-Id: 1566239480.2b3b60e6ad3756c422e0f304150419217d2478fb.whissi@gentoo
1 commit: 2b3b60e6ad3756c422e0f304150419217d2478fb
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 19 09:23:47 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 19 18:31:20 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b3b60e6
7
8 sys-fs/xfsprogs: bump to v5.2.0
9
10 - Adjust LTO handling to match upstream defaults.
11
12 - USE=static-libs removed because non-static builds
13 aren't supported anymore.
14
15 Link 1: https://www.spinics.net/lists/linux-xfs/msg30185.html
16 Link 2: https://www.spinics.net/lists/linux-xfs/msg30272.html
17
18 Package-Manager: Portage-2.3.72, Repoman-2.3.17
19 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
20
21 sys-fs/xfsprogs/Manifest | 1 +
22 sys-fs/xfsprogs/xfsprogs-5.2.0.ebuild | 106 ++++++++++++++++++++++++++++++++++
23 2 files changed, 107 insertions(+)
24
25 diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
26 index ea2966dfb22..80f6644369e 100644
27 --- a/sys-fs/xfsprogs/Manifest
28 +++ b/sys-fs/xfsprogs/Manifest
29 @@ -1,3 +1,4 @@
30 DIST xfsprogs-4.19.0.tar.xz 1212852 BLAKE2B 2d04390765c5e0dd7d51366f0310c9e680651d49bdd1ecd220b4eec50540a66c97bf6e54f976414351bc77381ffd463803836b27ca25b53960a278a34bc09775 SHA512 a96d0ce406534e70b0a531dfab296de420ec710cd0682dffaf5211602adf82dd59f84b9eb7793c54eabb782a9e0229acf7b247ab644d531ee9e5b51fe9dc0f58
31 DIST xfsprogs-5.0.0.tar.xz 1218476 BLAKE2B ef6eaab43531f696f739972c362e31c3304baaecb3485b45c16441a8bf7f1da7f47cd74a21660ba2c2bb45858a2b13b7af41c94671135f6a32a36eb745c024a0 SHA512 cebe3d2ea80676a99cc7f9cc014894398fbe3bdaf237829e9c7aa0404558c1ab16f2055acb5afd8234b2bc8475117bcef3c7500c553adb12bbaf3262bd077d18
32 DIST xfsprogs-5.1.0.tar.xz 1223736 BLAKE2B bfadb13cf3a4f9231eb13f4e7d3c803c2143abb776c0fee758ea7257097ef3fb79253c16133942041c20ff6078a1704fa18d08866c6a2e1a61b63f4de11d00c7 SHA512 ca5959edb299be8574b2ca51e907a418fab796ae92f588075a2aab0c2a3cf8dae49e2b68679c65c361201223e8f8ac29b1e5618eb1e519496c3aca9218620881
33 +DIST xfsprogs-5.2.0.tar.xz 1225884 BLAKE2B bec075d2adbafc5f6be215b658b8617141ade481558477525251c8547162f462af5464af5ac25d9498aca99b960a59071cc6651c36c6d30e5757e8d177c1b898 SHA512 b65ffb4d293f1ee0a9ec5aa35bf7a9491c2d536ad0da7f8e1d533743caebd98abffd1b93508969bac4135dc15434a9e170a516cedd373466ef762b65029f013f
34
35 diff --git a/sys-fs/xfsprogs/xfsprogs-5.2.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.2.0.ebuild
36 new file mode 100644
37 index 00000000000..22a5cc55eea
38 --- /dev/null
39 +++ b/sys-fs/xfsprogs/xfsprogs-5.2.0.ebuild
40 @@ -0,0 +1,106 @@
41 +# Copyright 1999-2019 Gentoo Authors
42 +# Distributed under the terms of the GNU General Public License v2
43 +
44 +EAPI=7
45 +
46 +inherit flag-o-matic toolchain-funcs systemd
47 +
48 +DESCRIPTION="xfs filesystem utilities"
49 +HOMEPAGE="https://xfs.wiki.kernel.org/"
50 +SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
51 +
52 +LICENSE="LGPL-2.1"
53 +SLOT="0"
54 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
55 +IUSE="icu libedit nls readline"
56 +
57 +LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
58 + icu? ( dev-libs/icu:=[static-libs(+)] )
59 + readline? ( sys-libs/readline:0=[static-libs(+)] )
60 + !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
61 +RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
62 + !<sys-fs/xfsdump-3"
63 +DEPEND="${RDEPEND}"
64 +BDEPEND="
65 + nls? ( sys-devel/gettext )
66 +"
67 +
68 +PATCHES=(
69 + "${FILESDIR}"/${PN}-4.9.0-underlinking.patch
70 + "${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch
71 + "${FILESDIR}"/${PN}-4.15.0-docdir.patch
72 +)
73 +
74 +pkg_setup() {
75 + if use readline && use libedit ; then
76 + ewarn "You have USE='readline libedit' but these are exclusive."
77 + ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
78 + fi
79 +}
80 +
81 +src_prepare() {
82 + default
83 +
84 + # Fix doc dir
85 + sed -i \
86 + -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
87 + include/builddefs.in || die
88 +
89 + # Don't install compressed docs
90 + sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
91 +}
92 +
93 +src_configure() {
94 + export DEBUG=-DNDEBUG
95 + export OPTIMIZER=${CFLAGS}
96 + unset PLATFORM # if set in user env, this breaks configure
97 +
98 + # Upstream does NOT support --disable-static anymore,
99 + # https://www.spinics.net/lists/linux-xfs/msg30185.html
100 + # https://www.spinics.net/lists/linux-xfs/msg30272.html
101 + local myconf=(
102 + --enable-blkid
103 + --with-crond-dir="${EPREFIX}/etc/cron.d"
104 + --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
105 + $(use_enable icu libicu)
106 + $(use_enable nls gettext)
107 + $(use_enable readline)
108 + $(usex readline --disable-editline $(use_enable libedit editline))
109 + )
110 +
111 + if is-flagq -fno-lto ; then
112 + einfo "LTO disabled via {C,CXX,F,FC}FLAGS"
113 + myconf+=( --disable-lto )
114 + else
115 + if is-flagq -flto ; then
116 + einfo "LTO forced via {C,CXX,F,FC}FLAGS"
117 + myconf+=( --enable-lto )
118 + elif use amd64 || use x86 ; then
119 + # match upstream default
120 + myconf+=( --enable-lto )
121 + else
122 + # LTO can cause problems on some architectures, bug 655638
123 + myconf+=( --disable-lto )
124 + fi
125 + fi
126 +
127 + econf "${myconf[@]}"
128 +}
129 +
130 +src_compile() {
131 + # Unset {CF,LD}FLAGS which are already set via configure
132 + # but will cause problems when available during make.
133 + # Fixed in >=xfsprogs-5.3.0.
134 + unset CFLAGS LDFLAGS
135 +
136 + emake V=1
137 +}
138 +
139 +src_install() {
140 + emake DIST_ROOT="${ED}" install
141 + # parallel install fails on this target for >=xfsprogs-3.2.0
142 + emake -j1 DIST_ROOT="${ED}" install-dev
143 +
144 + # removing unnecessary .la files if not needed
145 + find "${ED}" -type f -name '*.la' -delete || die
146 +}