1 |
mgorny 14/05/02 10:30:31 |
2 |
|
3 |
Modified: libtool-9999.ebuild ChangeLog |
4 |
Added: libtool-2.4.2-r1.ebuild |
5 |
Log: |
6 |
Introduce multilib support, bug #499390. |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
9 |
|
10 |
Revision Changes Path |
11 |
1.16 sys-devel/libtool/libtool-9999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild?rev=1.16&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild?rev=1.16&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild?r1=1.15&r2=1.16 |
16 |
|
17 |
Index: libtool-9999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v |
20 |
retrieving revision 1.15 |
21 |
retrieving revision 1.16 |
22 |
diff -u -r1.15 -r1.16 |
23 |
--- libtool-9999.ebuild 18 Jan 2014 03:56:58 -0000 1.15 |
24 |
+++ libtool-9999.ebuild 2 May 2014 10:30:31 -0000 1.16 |
25 |
@@ -1,12 +1,12 @@ |
26 |
# Copyright 1999-2014 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.15 2014/01/18 03:56:58 vapier Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.16 2014/05/02 10:30:31 mgorny Exp $ |
30 |
|
31 |
-EAPI="2" #356089 |
32 |
+EAPI="4" |
33 |
|
34 |
LIBTOOLIZE="true" #225559 |
35 |
WANT_LIBTOOL="none" |
36 |
-inherit eutils autotools multilib unpacker |
37 |
+inherit eutils autotools multilib unpacker multilib-minimal |
38 |
|
39 |
if [[ ${PV} == "9999" ]] ; then |
40 |
EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git |
41 |
@@ -26,7 +26,11 @@ |
42 |
|
43 |
RDEPEND="sys-devel/gnuconfig |
44 |
>=sys-devel/autoconf-2.65 |
45 |
- >=sys-devel/automake-1.11.1" |
46 |
+ >=sys-devel/automake-1.11.1 |
47 |
+ abi_x86_32? ( |
48 |
+ !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 |
49 |
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
50 |
+ )" |
51 |
DEPEND="${RDEPEND} |
52 |
test? ( !<sys-devel/binutils-2.20 ) |
53 |
app-arch/xz-utils" |
54 |
@@ -54,18 +58,17 @@ |
55 |
epunt_cxx |
56 |
} |
57 |
|
58 |
-src_configure() { |
59 |
+multilib_src_configure() { |
60 |
# the libtool script uses bash code in it and at configure time, tries |
61 |
# to find a bash shell. if /bin/sh is bash, it uses that. this can |
62 |
# cause problems for people who switch /bin/sh on the fly to other |
63 |
# shells, so just force libtool to use /bin/bash all the time. |
64 |
export CONFIG_SHELL=/bin/bash |
65 |
- |
66 |
+ ECONF_SOURCE="${S}" \ |
67 |
econf $(use_enable static-libs static) |
68 |
} |
69 |
|
70 |
-src_install() { |
71 |
- emake DESTDIR="${D}" install || die |
72 |
+multilib_src_install_all() { |
73 |
dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS |
74 |
|
75 |
# While the libltdl.la file is not used directly, the m4 ltdl logic |
76 |
@@ -75,7 +78,7 @@ |
77 |
# Building libtool with --disable-static will cause the installed |
78 |
# helper to not build static objects by default. This is undesirable |
79 |
# for crappy packages that utilize the system libtool, so undo that. |
80 |
- dosed '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' /usr/bin/libtool || die |
81 |
+ sed -i -e '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' "${D}"/usr/bin/libtool || die |
82 |
|
83 |
local x |
84 |
for x in $(find "${D}" -name config.guess -o -name config.sub) ; do |
85 |
|
86 |
|
87 |
|
88 |
1.214 sys-devel/libtool/ChangeLog |
89 |
|
90 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/ChangeLog?rev=1.214&view=markup |
91 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/ChangeLog?rev=1.214&content-type=text/plain |
92 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/ChangeLog?r1=1.213&r2=1.214 |
93 |
|
94 |
Index: ChangeLog |
95 |
=================================================================== |
96 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v |
97 |
retrieving revision 1.213 |
98 |
retrieving revision 1.214 |
99 |
diff -u -r1.213 -r1.214 |
100 |
--- ChangeLog 18 Jan 2014 03:56:58 -0000 1.213 |
101 |
+++ ChangeLog 2 May 2014 10:30:31 -0000 1.214 |
102 |
@@ -1,6 +1,12 @@ |
103 |
# ChangeLog for sys-devel/libtool |
104 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
105 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.213 2014/01/18 03:56:58 vapier Exp $ |
106 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.214 2014/05/02 10:30:31 mgorny Exp $ |
107 |
+ |
108 |
+*libtool-2.4.2-r1 (02 May 2014) |
109 |
+ |
110 |
+ 02 May 2014; Michał Górny <mgorny@g.o> +libtool-2.4.2-r1.ebuild, |
111 |
+ libtool-9999.ebuild: |
112 |
+ Introduce multilib support, bug #499390. |
113 |
|
114 |
18 Jan 2014; Mike Frysinger <vapier@g.o> libtool-2.4.2.ebuild, |
115 |
libtool-9999.ebuild: |
116 |
|
117 |
|
118 |
|
119 |
1.1 sys-devel/libtool/libtool-2.4.2-r1.ebuild |
120 |
|
121 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-2.4.2-r1.ebuild?rev=1.1&view=markup |
122 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-2.4.2-r1.ebuild?rev=1.1&content-type=text/plain |
123 |
|
124 |
Index: libtool-2.4.2-r1.ebuild |
125 |
=================================================================== |
126 |
# Copyright 1999-2014 Gentoo Foundation |
127 |
# Distributed under the terms of the GNU General Public License v2 |
128 |
# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.2-r1.ebuild,v 1.1 2014/05/02 10:30:31 mgorny Exp $ |
129 |
|
130 |
EAPI="4" |
131 |
|
132 |
LIBTOOLIZE="true" #225559 |
133 |
WANT_LIBTOOL="none" |
134 |
inherit eutils autotools multilib unpacker multilib-minimal |
135 |
|
136 |
if [[ ${PV} == "9999" ]] ; then |
137 |
EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git |
138 |
http://git.savannah.gnu.org/r/${PN}.git" |
139 |
inherit git-2 |
140 |
else |
141 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
142 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
143 |
fi |
144 |
|
145 |
DESCRIPTION="A shared library tool for developers" |
146 |
HOMEPAGE="http://www.gnu.org/software/libtool/" |
147 |
|
148 |
LICENSE="GPL-2" |
149 |
SLOT="2" |
150 |
IUSE="static-libs test vanilla" |
151 |
|
152 |
RDEPEND="sys-devel/gnuconfig |
153 |
!<sys-devel/autoconf-2.62:2.5 |
154 |
!<sys-devel/automake-1.11.1:1.11 |
155 |
!=sys-devel/libtool-2*:1.5 |
156 |
abi_x86_32? ( |
157 |
!<=app-emulation/emul-linux-x86-baselibs-20140406-r2 |
158 |
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
159 |
)" |
160 |
DEPEND="${RDEPEND} |
161 |
test? ( !<sys-devel/binutils-2.20 ) |
162 |
app-arch/xz-utils" |
163 |
[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man" |
164 |
|
165 |
src_unpack() { |
166 |
if [[ ${PV} == "9999" ]] ; then |
167 |
git-2_src_unpack |
168 |
cd "${S}" |
169 |
./bootstrap || die |
170 |
else |
171 |
unpacker_src_unpack |
172 |
fi |
173 |
} |
174 |
|
175 |
src_prepare() { |
176 |
use vanilla && return 0 |
177 |
|
178 |
cd libltdl/m4 |
179 |
epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105 |
180 |
cd .. |
181 |
AT_NOELIBTOOLIZE=yes eautoreconf |
182 |
cd .. |
183 |
AT_NOELIBTOOLIZE=yes eautoreconf |
184 |
epunt_cxx |
185 |
} |
186 |
|
187 |
multilib_src_configure() { |
188 |
# the libtool script uses bash code in it and at configure time, tries |
189 |
# to find a bash shell. if /bin/sh is bash, it uses that. this can |
190 |
# cause problems for people who switch /bin/sh on the fly to other |
191 |
# shells, so just force libtool to use /bin/bash all the time. |
192 |
export CONFIG_SHELL=/bin/bash |
193 |
ECONF_SOURCE="${S}" \ |
194 |
econf $(use_enable static-libs static) |
195 |
} |
196 |
|
197 |
multilib_src_install_all() { |
198 |
dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS |
199 |
|
200 |
# While the libltdl.la file is not used directly, the m4 ltdl logic |
201 |
# keys off of its existence when searching for ltdl support. #293921 |
202 |
#use static-libs || find "${D}" -name libltdl.la -delete |
203 |
|
204 |
# Building libtool with --disable-static will cause the installed |
205 |
# helper to not build static objects by default. This is undesirable |
206 |
# for crappy packages that utilize the system libtool, so undo that. |
207 |
sed -i -e '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' "${D}"/usr/bin/libtool || die |
208 |
|
209 |
local x |
210 |
for x in $(find "${D}" -name config.guess -o -name config.sub) ; do |
211 |
ln -sf /usr/share/gnuconfig/${x##*/} "${x}" || die |
212 |
done |
213 |
} |
214 |
|
215 |
pkg_preinst() { |
216 |
preserve_old_lib /usr/$(get_libdir)/libltdl.so.3 |
217 |
} |
218 |
|
219 |
pkg_postinst() { |
220 |
preserve_old_lib_notify /usr/$(get_libdir)/libltdl.so.3 |
221 |
} |