Fix building with -Wl,--as-needed wrt #271509 by Kacper Kowalik.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 39 insertions, 15 deletions

diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog
index 804d3b4e32a1..a40bea14d1d0 100644
--- a/dev-libs/protobuf/ChangeLog
+++ b/dev-libs/protobuf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/protobuf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.18 2010/05/14 19:30:02 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.19 2010/05/15 12:15:57 ssuominen Exp $
+
+  15 May 2010; Samuli Suominen <ssuominen@gentoo.org> protobuf-2.3.0.ebuild,
+  +files/protobuf-2.3.0-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #271509 by Kacper Kowalik.
 
   14 May 2010; Joseph Jezak <josejx@gentoo.org> protobuf-2.3.0.ebuild:
   Marked ~ppc/~ppc64 for bug #289287.
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 93e8eb3d4edb..cea3c04e5329 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70protobuf-gentoo.el 170 RMD160 f6208c9a555325c1a6e1b26daee6fbc425cbfd98 SHA1 8f8f8ce9bdab9a8f9a11b16236be383488277cb3 SHA256 b6e5c2f11a63f9eb4a9382227ce8f41bfcf23213166d2fb212e21e237b2f264d
+AUX protobuf-2.3.0-asneeded.patch 1224 RMD160 8a59e9cc17e8650e84a8b1d5fd7c90dfca50af00 SHA1 f9e05456ffe091aedb5d6336de3c7578793341d4 SHA256 97bc007faafac8472d898c875bb2eabe062239088ec614ebd0c3ba2915e15d53
 DIST protobuf-2.3.0.tar.bz2 1424966 RMD160 92b9c374ce3ccbb0b0d22d08e9f9d3a5a68d1ac8 SHA1 db0fbdc58be22a676335a37787178a4dfddf93c6 SHA256 760c7707c3fe9ce801916bbd3067d711a33aa550c01b32d1e1761119cf6280ac
-EBUILD protobuf-2.3.0.ebuild 2594 RMD160 9c1bf381b2842129c44331011ed2a8c3ea6e4591 SHA1 70b4533888453746e26b0c5edabd9f94c1cc1fd4 SHA256 f17e166f8e701e4dac6f0465d845c8f30e35c397d5157955c2564a583077d282
-MISC ChangeLog 3237 RMD160 5a5b6d820bad8079e3a29d7374ee0c6ddbad6921 SHA1 9228898ce09e15013f770f42635560025a675b8e SHA256 6fa55c51125dbde6e9d8ba1177783514a05c8089d8a3e8343a83328ef26352ff
+EBUILD protobuf-2.3.0.ebuild 2663 RMD160 82a85d6fcf19911d12a99c9b1e0d8e7ab1295a28 SHA1 a464e81bc815adc94c5b63cc1932eef9ab5f0de3 SHA256 961421046cd85db37c2d3dc64d19b3afb6e9a7723701be61162ba840097e8b30
+MISC ChangeLog 3425 RMD160 7c068a3ba4eb03987a5a8a7f117a69cb1b2d668b SHA1 4f0ffc29a0037f54cb3ce05b72395e63bf044c89 SHA256 c2fc8ca121991b6a87d392107222c93cd211655530fde4caa735950e3af5ab08
 MISC metadata.xml 259 RMD160 854ca28d16ec40e1d7e59e2416c9633513d97454 SHA1 09b1f80597e496801e479f5b2642cd04aafadb74 SHA256 e4352d15b7bff1306476d49687525386bd7acca33010e3f06ed91b963e3d5893
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvtpL4ACgkQcsIHjyDViGRf2gCg3kr6HLXTGaH4BZIAtQPi58I8
-P+cAoLY0mZLqgjdY5Hq1Yh5GqxVRzQ5a
-=RbLu
------END PGP SIGNATURE-----
diff --git a/dev-libs/protobuf/files/protobuf-2.3.0-asneeded.patch b/dev-libs/protobuf/files/protobuf-2.3.0-asneeded.patch
new file mode 100644
index 000000000000..86c4b5976396
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-2.3.0-asneeded.patch
@@ -0,0 +1,26 @@
+Fixing as-needed issues
+
+http://bugs.gentoo.org/show_bug.cgi?id=271509
+
+--- m4/acx_pthread.m4
++++ m4/acx_pthread.m4
+@@ -99,7 +99,7 @@
+ # which indicates that we try without any flags at all, and "pthread-config"
+ # which is a program returning the flags for the Pth emulation library.
+ 
+-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
++acx_pthread_flags="pthreads none pthread -Kthread -kthread lthread -pthread -pthreads -mthreads --thread-safe -mt pthread-config"
+ 
+ # The ordering *is* (sometimes) important.  Some notes on the
+ # individual items follow:
+--- gtest/m4/acx_pthread.m4
++++ gtest/m4/acx_pthread.m4
+@@ -99,7 +99,7 @@
+ # which indicates that we try without any flags at all, and "pthread-config"
+ # which is a program returning the flags for the Pth emulation library.
+ 
+-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
++acx_pthread_flags="pthreads none pthread -Kthread -kthread lthread -pthread -pthreads -mthreads --thread-safe -mt pthread-config"
+ 
+ # The ordering *is* (sometimes) important.  Some notes on the
+ # individual items follow:
diff --git a/dev-libs/protobuf/protobuf-2.3.0.ebuild b/dev-libs/protobuf/protobuf-2.3.0.ebuild
index 2c18969dcae3..6d6cb1a28d38 100644
--- a/dev-libs/protobuf/protobuf-2.3.0.ebuild
+++ b/dev-libs/protobuf/protobuf-2.3.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.3.0.ebuild,v 1.5 2010/05/14 19:30:02 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.3.0.ebuild,v 1.6 2010/05/15 12:15:57 ssuominen Exp $
 
 EAPI="2"
 
 JAVA_PKG_IUSE="source"
 PYTHON_DEPEND="python? 2"
 
-inherit eutils distutils python java-pkg-opt-2 elisp-common
+inherit autotools eutils distutils python java-pkg-opt-2 elisp-common
 
 DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
 HOMEPAGE="http://code.google.com/p/protobuf/"
@@ -28,6 +28,9 @@ PYTHON_MODNAME="google/protobuf"
 DISTUTILS_SRC_TEST="setup.py"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+
 	use python && {
 		python_convert_shebangs -r 2 .
 		distutils_src_prepare