diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-11-01 02:44:02 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-11-01 02:44:02 +0000 |
| commit | af17b3afa4378c5252c8e8e591a1a4d838681c72 (patch) | |
| tree | 98dca4021de99881198942257ba6532b541588e5 /sys-devel/libtool | |
| parent | Fix mips asm/ptrace.h #527642 by Matt Turner. (diff) | |
| download | gentoo-2-af17b3afa4378c5252c8e8e591a1a4d838681c72.tar.gz gentoo-2-af17b3afa4378c5252c8e8e591a1a4d838681c72.tar.bz2 gentoo-2-af17b3afa4378c5252c8e8e591a1a4d838681c72.zip | |
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)
Diffstat (limited to 'sys-devel/libtool')
| -rw-r--r-- | sys-devel/libtool/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-devel/libtool/libtool-2.4.3-r1.ebuild | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog index 9ba5edd15e0e..884220347611 100644 --- a/sys-devel/libtool/ChangeLog +++ b/sys-devel/libtool/ChangeLog @@ -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 <vapier@gentoo.org> 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 <vapier@gentoo.org> +files/libtool-2.4.3-test-cmdline_wrap.patch, libtool-2.4.3-r1.ebuild: diff --git a/sys-devel/libtool/libtool-2.4.3-r1.ebuild b/sys-devel/libtool/libtool-2.4.3-r1.ebuild index 97f0872655b4..d53c4b1c0611 100644 --- a/sys-devel/libtool/libtool-2.4.3-r1.ebuild +++ b/sys-devel/libtool/libtool-2.4.3-r1.ebuild @@ -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 @@ multilib_src_configure() { 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 @@ multilib_src_install_all() { # 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 |