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-devel/libtool: libtool-2.4.3-r1.ebuild ChangeLog
Date: Sat, 01 Nov 2014 02:55:04
Message-Id: 20141101025500.93D7892E9@oystercatcher.gentoo.org
1 vapier 14/11/01 02:55:00
2
3 Modified: libtool-2.4.3-r1.ebuild ChangeLog
4 Log:
5 Rework the libtool hack so we do not generate static libs.
6
7 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
8
9 Revision Changes Path
10 1.6 sys-devel/libtool/libtool-2.4.3-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r1.ebuild?rev=1.6&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r1.ebuild?rev=1.6&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r1.ebuild?r1=1.5&r2=1.6
15
16 Index: libtool-2.4.3-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r1.ebuild,v
19 retrieving revision 1.5
20 retrieving revision 1.6
21 diff -u -r1.5 -r1.6
22 --- libtool-2.4.3-r1.ebuild 1 Nov 2014 02:44:02 -0000 1.5
23 +++ libtool-2.4.3-r1.ebuild 1 Nov 2014 02:55:00 -0000 1.6
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r1.ebuild,v 1.5 2014/11/01 02:44:02 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r1.ebuild,v 1.6 2014/11/01 02:55:00 vapier Exp $
29
30 EAPI="4"
31
32 @@ -68,15 +68,18 @@
33 export CONFIG_SHELL=/bin/bash
34 ECONF_SOURCE="${S}" \
35 econf $(use_enable static-libs static)
36 +}
37
38 +hack_libtool() {
39 # Building libtool with --disable-static will cause the installed
40 # helper to not build static objects by default. This is undesirable
41 # for crappy packages that utilize the system libtool, so undo that.
42 # It also breaks some unittests. #384731
43 - sed -i -e '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' libtool || die
44 + sed -i -e '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' "$@" || die
45 }
46
47 multilib_src_test() {
48 + hack_libtool libtool
49 emake check
50 }
51
52 @@ -87,6 +90,8 @@
53 # keys off of its existence when searching for ltdl support. #293921
54 #use static-libs || find "${ED}" -name libltdl.la -delete
55
56 + hack_libtool "${ED}"/usr/bin/libtool
57 +
58 local x
59 for x in $(find "${ED}" -name config.guess -o -name config.sub) ; do
60 ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die
61
62
63
64 1.233 sys-devel/libtool/ChangeLog
65
66 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/ChangeLog?rev=1.233&view=markup
67 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/ChangeLog?rev=1.233&content-type=text/plain
68 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/ChangeLog?r1=1.232&r2=1.233
69
70 Index: ChangeLog
71 ===================================================================
72 RCS file: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v
73 retrieving revision 1.232
74 retrieving revision 1.233
75 diff -u -r1.232 -r1.233
76 --- ChangeLog 1 Nov 2014 02:44:02 -0000 1.232
77 +++ ChangeLog 1 Nov 2014 02:55:00 -0000 1.233
78 @@ -1,6 +1,9 @@
79 # ChangeLog for sys-devel/libtool
80 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
81 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.232 2014/11/01 02:44:02 vapier Exp $
82 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.233 2014/11/01 02:55:00 vapier Exp $
83 +
84 + 01 Nov 2014; Mike Frysinger <vapier@g.o> libtool-2.4.3-r1.ebuild:
85 + Rework the libtool hack so we do not generate static libs.
86
87 01 Nov 2014; Mike Frysinger <vapier@g.o> libtool-2.4.3-r1.ebuild:
88 Move up the libtool static hack to fix unit tests too #384731 by Markus Oehme.