vapier 14/11/01 02:44:02 Modified: libtool-2.4.3-r1.ebuild ChangeLog Log: Move up the libtool static hack to fix unit tests too #384731 by Markus Oehme. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.5 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.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r1.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r1.ebuild?r1=1.4&r2=1.5 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libtool-2.4.3-r1.ebuild 1 Nov 2014 01:44:36 -0000 1.4 +++ libtool-2.4.3-r1.ebuild 1 Nov 2014 02:44:02 -0000 1.5 @@ -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.4 2014/11/01 01:44:36 vapier Exp $ +# $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 $ EAPI="4" @@ -68,6 +68,12 @@ export CONFIG_SHELL=/bin/bash ECONF_SOURCE="${S}" \ econf $(use_enable static-libs static) + + # 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 } multilib_src_test() { @@ -81,11 +87,6 @@ # keys off of its existence when searching for ltdl support. #293921 #use static-libs || find "${ED}" -name libltdl.la -delete - # 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. - sed -i -e '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' "${ED}"/usr/bin/libtool || die - 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.232 sys-devel/libtool/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/ChangeLog?rev=1.232&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/ChangeLog?rev=1.232&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/ChangeLog?r1=1.231&r2=1.232 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- ChangeLog 1 Nov 2014 01:44:36 -0000 1.231 +++ ChangeLog 1 Nov 2014 02:44:02 -0000 1.232 @@ -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.231 2014/11/01 01:44:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.232 2014/11/01 02:44:02 vapier Exp $ + + 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. 01 Nov 2014; Mike Frysinger <[email protected]> +files/libtool-2.4.3-test-cmdline_wrap.patch, libtool-2.4.3-r1.ebuild:
