Have system libtool build static objs by default even when USE=-static-libs #336167#20.

Package-Manager: portage-2.2.0_alpha65/cvs/Linux x86_64

5 files changed, 33 insertions, 11 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 913d75dbd256..e55707cc1040 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.195 2011/10/18 17:46:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.196 2011/10/20 03:39:19 vapier Exp $
+
+*libtool-2.4-r4 (20 Oct 2011)
+
+  20 Oct 2011; Mike Frysinger <vapier@gentoo.org> -libtool-2.4-r3.ebuild,
+  +libtool-2.4-r4.ebuild, libtool-2.4.2.ebuild, libtool-9999.ebuild:
+  Have system libtool build static objs by default even when USE=-static-libs
+  #336167#20.
 
 *libtool-2.4.2 (18 Oct 2011)
 
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index e346e8da5360..1a0a989b3c01 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -17,15 +17,15 @@ EBUILD libtool-1.5.26-r1.ebuild 759 RMD160 59eaf949c33f58e014cb2a167309ab8d2f036
 EBUILD libtool-1.5.26.ebuild 2837 RMD160 01e8a0bd7256d2aeda34e2f7791baba3fb979b02 SHA1 f9ec3c2ffb6d85610db75ffbb95e611e45a7576e SHA256 faf95db0c3e14440410e543a28a1d824c176e72a7f6091bd93f72bf9e74e707a
 EBUILD libtool-2.2.10.ebuild 1810 RMD160 194d25736763a21833e4472d26852aac15245969 SHA1 c9ce961c6397ff8a57a6183409c9916cc9ebf45b SHA256 7e287f68cc01dbcd2161f8b8e5704b30cbc844ad8d7bbc677271476f47268e24
 EBUILD libtool-2.4-r1.ebuild 1872 RMD160 c5af813e26426b822353988c95c6ac9d8d012049 SHA1 0ae0a0cbb962ae3175ba1597423ba576482d0942 SHA256 f4389cf4491d4ba03cf93b1bef73be71ca15715c1bc55dcd03bece80dfd0388b
-EBUILD libtool-2.4-r3.ebuild 2468 RMD160 7255d2102ffbb4759001ad9cdc27562c0c3e8e21 SHA1 ba9042263a5e8c85ca4070eb2ad0e2564cb67657 SHA256 eb051e1339aca6e4f601a3ac5973d6dcd7ae821ee1605bb257bbb43d8740242b
-EBUILD libtool-2.4.2.ebuild 2419 RMD160 a252ab4d33e02eccba0cb8a20ad9903ff9506512 SHA1 be7bd7c0218973abb67cbf545459055ec58be328 SHA256 ecd633dac224fa2b09e6801dca8218a8ec7964081f47f3c0c35070d804723bbd
-EBUILD libtool-9999.ebuild 2380 RMD160 4690eb3b4b163a8fa55736440794111c15a827fa SHA1 ebf1ba411ef4454c004716a0228d5a42284051dd SHA256 664aa578308dba47139db28fa1982490406763f778d86e46f70d744ba0f8458a
-MISC ChangeLog 29153 RMD160 4237f79fd708ff2901de4e5e0a7e25af3e883688 SHA1 58fcc9b42d23a8f5d5b3a2787f8f49a408ed449c SHA256 797275ede57dd24ea94fb113a85e8d0624c5490575bba9b7c79008b59e260dae
+EBUILD libtool-2.4-r4.ebuild 2764 RMD160 22cf4baf0dd3805992fec6b1bb54d55d6ecb2bc8 SHA1 1473ad5ba74c1f8ac318c54475b3040a515e8205 SHA256 d7528b0e015cb1d2a81bcf5170f7b649ee7db5da904d07a6d3a7ea67557b13ab
+EBUILD libtool-2.4.2.ebuild 2715 RMD160 1519bff93ad58539ab75a4d3007e6a3adeac1ab8 SHA1 01e3a2f51b6e98237255be95d2e6465d8ff0ae18 SHA256 bdc96c42f73a81edb6b82e1a5bc4b77da93426e991f224a36a9ad316ed548c97
+EBUILD libtool-9999.ebuild 2677 RMD160 24a1a3174ec8850979cdb6f91941f6d0f4914c75 SHA1 a6f51bba16bfe8f4b6482fdcfcdd08674cc790d5 SHA256 67d6520144f95b8ea7d940143df12a70a6a5696f11ce04de725c2a865bd6a0f4
+MISC ChangeLog 29420 RMD160 aeb9cd69c7a8eef069cb632fe91693f4141b6ad9 SHA1 673e6f142fb8d8770fe009c7837fc0bb79e638d1 SHA256 9f8b3f5d07e5f459d6f7fcf53d73052151690c7e327edd8c37940e91d2d2de58
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6du2IACgkQaC/OocHi7JaCjgD/SoTrBOjkwmLSYKtdFShdVD2K
-uJfFLOYoII/pY74DJyABAJ7ZLQBYCkkLvZiSAk+GKfJ/X9uDo/hztB6998VFH/d0
-=uTX/
+iF4EAREIAAYFAk6fl/AACgkQaC/OocHi7Jb6DwEAi3LbWR1JQQLSXFPZWE3UVwFl
+aDmTmgV2y0lZDx5ckrkA/16M0qOx8flBu4n2er46OXlpiFz64SmPzJRKKpzCNPmN
+=rBEj
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/libtool-2.4-r3.ebuild b/sys-devel/libtool/libtool-2.4-r4.ebuild
index e171fe37ba4f..2a60dd1648eb 100644
--- a/sys-devel/libtool/libtool-2.4-r3.ebuild
+++ b/sys-devel/libtool/libtool-2.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4-r3.ebuild,v 1.2 2011/10/04 20:42:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4-r4.ebuild,v 1.1 2011/10/20 03:39:19 vapier Exp $
 
 EAPI="2" #356089
 
@@ -76,6 +76,11 @@ src_install() {
 	# keys off of its existence when searching for ltdl support. #293921
 	#use static-libs || find "${D}" -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.
+	dosed '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' /usr/bin/libtool || die
+
 	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
 		rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}"
 	done
diff --git a/sys-devel/libtool/libtool-2.4.2.ebuild b/sys-devel/libtool/libtool-2.4.2.ebuild
index b0f796aaf210..b69bc069c4f9 100644
--- a/sys-devel/libtool/libtool-2.4.2.ebuild
+++ b/sys-devel/libtool/libtool-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.2.ebuild,v 1.1 2011/10/18 17:46:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.2.ebuild,v 1.2 2011/10/20 03:39:19 vapier Exp $
 
 EAPI="2" #356089
 
@@ -74,6 +74,11 @@ src_install() {
 	# keys off of its existence when searching for ltdl support. #293921
 	#use static-libs || find "${D}" -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.
+	dosed '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' /usr/bin/libtool || die
+
 	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
 		rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}"
 	done
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index 68a3cfe425c8..e4cf831c0398 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.9 2011/10/04 20:42:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.10 2011/10/20 03:39:19 vapier Exp $
 
 EAPI="2" #356089
 
@@ -73,6 +73,11 @@ src_install() {
 	# keys off of its existence when searching for ltdl support. #293921
 	#use static-libs || find "${D}" -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.
+	dosed '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' /usr/bin/libtool || die
+
 	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
 		rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}"
 	done