Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/xfsprogs: xfsprogs-3.1.11-r1.ebuild ChangeLog
Date: Wed, 25 Dec 2013 08:49:39
Message-Id: 20131225084936.8BB492004E@flycatcher.gentoo.org
1 vapier 13/12/25 08:49:36
2
3 Modified: ChangeLog
4 Added: xfsprogs-3.1.11-r1.ebuild
5 Log:
6 Install extra headers for libxfs #486514 by Stefan Reimer. Rewrite shared lib installs to only use libtool to avoid rpath issues.
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
9
10 Revision Changes Path
11 1.167 sys-fs/xfsprogs/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/ChangeLog?rev=1.167&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/ChangeLog?rev=1.167&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/ChangeLog?r1=1.166&r2=1.167
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v
20 retrieving revision 1.166
21 retrieving revision 1.167
22 diff -u -r1.166 -r1.167
23 --- ChangeLog 18 Oct 2013 08:17:44 -0000 1.166
24 +++ ChangeLog 25 Dec 2013 08:49:36 -0000 1.167
25 @@ -1,6 +1,13 @@
26 # ChangeLog for sys-fs/xfsprogs
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.166 2013/10/18 08:17:44 polynomial-c Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.167 2013/12/25 08:49:36 vapier Exp $
30 +
31 +*xfsprogs-3.1.11-r1 (25 Dec 2013)
32 +
33 + 25 Dec 2013; Mike Frysinger <vapier@g.o>
34 + +files/xfsprogs-3.1.11-sharedlibs.patch, +xfsprogs-3.1.11-r1.ebuild:
35 + Install extra headers for libxfs #486514 by Stefan Reimer. Rewrite shared lib
36 + installs to only use libtool to avoid rpath issues.
37
38 *xfsprogs-3.1.11 (18 Oct 2013)
39
40
41
42
43 1.1 sys-fs/xfsprogs/xfsprogs-3.1.11-r1.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.11-r1.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.11-r1.ebuild?rev=1.1&content-type=text/plain
47
48 Index: xfsprogs-3.1.11-r1.ebuild
49 ===================================================================
50 # Copyright 1999-2013 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.11-r1.ebuild,v 1.1 2013/12/25 08:49:36 vapier Exp $
53
54 EAPI="4"
55
56 inherit eutils toolchain-funcs multilib
57
58 DESCRIPTION="xfs filesystem utilities"
59 HOMEPAGE="http://oss.sgi.com/projects/xfs/"
60 SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
61 ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
62
63 LICENSE="LGPL-2.1"
64 SLOT="0"
65 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
66 IUSE="libedit nls readline static static-libs"
67 REQUIRED_USE="static? ( static-libs )"
68
69 LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
70 readline? ( sys-libs/readline[static-libs(+)] )
71 !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
72 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
73 !<sys-fs/xfsdump-3"
74 DEPEND="${RDEPEND}
75 static? (
76 ${LIB_DEPEND}
77 readline? ( sys-libs/ncurses[static-libs] )
78 )
79 nls? ( sys-devel/gettext )"
80
81 pkg_setup() {
82 if use readline && use libedit ; then
83 ewarn "You have USE='readline libedit' but these are exclusive."
84 ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
85 fi
86 }
87
88 src_prepare() {
89 epatch "${FILESDIR}"/${PN}-3.1.11-sharedlibs.patch
90
91 sed -i \
92 -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
93 include/builddefs.in || die
94 sed -i \
95 -e '1iLLDFLAGS = -static' \
96 {estimate,fsr}/Makefile || die
97 sed -i \
98 -e "/LLDFLAGS/s:-static:$(use static && echo -all-static):" \
99 $(find -name Makefile) || die
100
101 # libdisk has broken blkid conditional checking
102 sed -i \
103 -e '/LIB_SUBDIRS/s:libdisk::' \
104 Makefile || die
105
106 # TODO: write a patch for configure.in to use pkg-config for the uuid-part
107 if use static && use readline ; then
108 sed -i \
109 -e 's|-lreadline|\0 -lncurses|' \
110 -e 's|-lblkid|\0 -luuid|' \
111 configure || die
112 fi
113 }
114
115 src_configure() {
116 export DEBUG=-DNDEBUG
117 export OPTIMIZER=${CFLAGS}
118 unset PLATFORM # if set in user env, this breaks configure
119
120 local myconf
121 if use static || use static-libs ; then
122 myconf+=" --enable-static"
123 else
124 myconf+=" --disable-static"
125 fi
126
127 econf \
128 --bindir=/usr/bin \
129 --libexecdir=/usr/$(get_libdir) \
130 $(use_enable nls gettext) \
131 $(use_enable readline) \
132 $(usex readline --disable-editline $(use_enable libedit editline)) \
133 ${myconf}
134
135 MAKEOPTS+=" V=1"
136 }
137
138 src_install() {
139 emake DIST_ROOT="${ED}" install install-{dev,qa}
140
141 # handle is for xfsdump, the rest for xfsprogs
142 gen_usr_ldscript -a xfs xlog
143 # removing unnecessary .la files if not needed
144 use static-libs || find "${ED}" -name '*.la' -delete
145 }