vapier 14/11/01 02:55:00 Modified: libtool-2.4.3-r1.ebuild ChangeLog Log: Rework the libtool hack so we do not generate static libs. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.6 sys-devel/libtool/libtool-2.4.3-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r1.ebuild?rev=1.6&view=markup 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 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r1.ebuild?r1=1.5&r2=1.6 Index: libtool-2.4.3-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r1.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libtool-2.4.3-r1.ebuild 1 Nov 2014 02:44:02 -0000 1.5 +++ libtool-2.4.3-r1.ebuild 1 Nov 2014 02:55:00 -0000 1.6 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI="4" @@ -68,15 +68,18 @@ export CONFIG_SHELL=/bin/bash ECONF_SOURCE="${S}" \ econf $(use_enable static-libs static) +} +hack_libtool() { # Building libtool with --disable-static will cause the installed # helper to not build static objects by default. This is undesirable # for crappy packages that utilize the system libtool, so undo that. # It also breaks some unittests. #384731 - sed -i -e '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' libtool || die + sed -i -e '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' "$@" || die } multilib_src_test() { + hack_libtool libtool emake check } @@ -87,6 +90,8 @@ # keys off of its existence when searching for ltdl support. #293921 #use static-libs || find "${ED}" -name libltdl.la -delete + hack_libtool "${ED}"/usr/bin/libtool + local x for x in $(find "${ED}" -name config.guess -o -name config.sub) ; do ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die 1.233 sys-devel/libtool/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/ChangeLog?rev=1.233&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/ChangeLog?rev=1.233&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/ChangeLog?r1=1.232&r2=1.233 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v retrieving revision 1.232 retrieving revision 1.233 diff -u -r1.232 -r1.233 --- ChangeLog 1 Nov 2014 02:44:02 -0000 1.232 +++ ChangeLog 1 Nov 2014 02:55:00 -0000 1.233 @@ -1,6 +1,9 @@ # ChangeLog for sys-devel/libtool # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.232 2014/11/01 02:44:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.233 2014/11/01 02:55:00 vapier Exp $ + + 01 Nov 2014; Mike Frysinger <[email protected]> libtool-2.4.3-r1.ebuild: + Rework the libtool hack so we do not generate static libs. 01 Nov 2014; Mike Frysinger <[email protected]> libtool-2.4.3-r1.ebuild: Move up the libtool static hack to fix unit tests too #384731 by Markus Oehme.
