Fix underlinking of libstdc++. Bug 463498

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xC4A92BF5

4 files changed, 32 insertions, 18 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 765180ba6c17..88d786ea49a1 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.696 2013/04/01 19:42:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.697 2013/04/02 08:12:17 olemarkus Exp $
+
+  02 Apr 2013; Ole Markus With <olemarkus@gentoo.org>
+  +files/fix-libstdc++-underlinking.patch, php-5.3.23-r2.ebuild:
+  Fix underlinking of libstdc++. Bug 463498
 
   01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> php-5.3.23.ebuild,
   php-5.4.13.ebuild:
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 493ba2a24a07..9e4329ce162e 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 20php5-envd 145 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4 SHA512 581aa86479e3cd584ee1bc6dc6d4a135fe8ec343fe5519566d728d81f7018cfb23658bd0c0368951d380982c75adbb4f45acf3c146868aaf4e4ec8e9f2fad1ce WHIRLPOOL b9cfe0e80ba437bbc6008223c268bdafcde306ba8083dce96815804f3e1ec0937706e0db091149785a0076a6c6eaab8f7dff28578b706e84b4bb4e67850a4ecd
 AUX 70_mod_php5.conf-apache2 348 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c SHA512 c74ec09c3c4124a15e14ece4bb769bb889466160cc0878ca3d55d5afc30fd4c05673c40428b75be669f72e82ba29f60ed19767caca77bba8adc12aae1c83f6f3 WHIRLPOOL fd503ec904a3853b90f8f4cc2042cf9014fdb1383a508d22e680559009b5b1e0beb5a09909a393e53868a64712c63e35642915787fa4176af07cb594adedb441
@@ -20,6 +20,7 @@ AUX eblits/src_prepare-v2.eblit 2604 SHA256 fe7534260fb81a012b8021b5d555756ce873
 AUX eblits/src_prepare-v3.eblit 2649 SHA256 7ea3a5351fabeb050161e64c09b98ff945bbdb8b4d1a7fb83d6b4645f277b486 SHA512 0c1c5caf47e5955116ddec5b87022920a37f079211aaefb25c9a14b0c269343e808593b4727ea7e3d07487ed0a74de0e683ded318200c304943149548a75c34b WHIRLPOOL 055c5bf47e2c02537e24421cc796316b8a390a0d5447149eda5398b9708e05bfd71167e5ea2fe959432a6abb508f84d7f7cbc84748048c87e7777468bb6ab78e
 AUX eblits/src_prepare-v4.eblit 2317 SHA256 7c18252a49a6d8e071471d14624f284d7b3ad8b95cad4a001e10e6e521f4c9b1 SHA512 e5c8200cd393266f9e608ebe680e74d539f897ab288303ba4b09963c09c3fdcdcd850443c7e76b0f9343f977fec148f448391e94ffb0e81fe46c69e7e9d7bca6 WHIRLPOOL 0246d02c8e1856acbae723ed53f8286921fed7b671ecf2fd7c712d7345ca6dcebfe79e09e83c77df06e4fa6dff0f3e25c92027f2bc9bed2c2b69018cbbcac987
 AUX eblits/src_test-v1.eblit 1556 SHA256 c8459832955cdb3c35bcdc43dca5e20a1133012f955b75c8469003ca3f2c4d69 SHA512 58dd00322e2dd9bd9e8efb20e08fcaf22e45185c454b79faeb2b125dfe9a8548cc3842d0a6bf352103058fa8ede7487b1f5632da4caab7d817bd0eab335e4405 WHIRLPOOL b2370e7361379796e7d56949418cae78fce72ec169ec61d86cf1c60c70b03c6f650671ad7b4440558ec8a462086f83e05b4bc7e4be501b9ac738a2ed97565bd7
+AUX fix-libstdc++-underlinking.patch 264 SHA256 c174fbe838373d3fad9536c621685426c71ccfea73371889f60d7bed07efc230 SHA512 3b91b6917c8d452cbeaf98c445b989f1e0d2c86a02598b5e6647625289868eaf51eee253db8909fb5faada3b588f22b3bfee44b679d6257bcc00c067a80938d6 WHIRLPOOL b7024c2f478e79967e81f938d36689c2cd968b3db2a05f9ce3a57721cd3727046b300d1b436e73cd0ae31393d3e572164743ffe139d36798f41a3e88e86c4239
 AUX missing-openssl-include.patch 456 SHA256 40d7a7de8dfde9844c12a03f96c2b4c78b08b776505f94abdddb6f5c7617454c SHA512 e6c663e508772e403e540fc900f752f18d12eef35526154716728da0ba89a8eb48f12bbb7611c0672f22a1d0b6814365e90ecabb8b8e78411816b8b8889f03ea WHIRLPOOL 258448576333077c14ba5181ab4e6de2ecc75d4811aeac5fc2e71ba22e8f4644db43998c50db6423cda55c82039c1f6cf5ee16ef79b84bd4c3161b33776b9936
 AUX php-fpm-r1.conf 12966 SHA256 c4308a92ade93812c6579b74a72cd1f3e1a35f7e63289722f461771d5702448c SHA512 3d421c1e8b8f6ecffbf8284a7f79a1e5cc3f0893b1a47f5ccd980d554b058c363c1e236aa3157c2b66791b3291c6e98981cc527d501328ccc3ccb34eee2950ef WHIRLPOOL 1f591597698e28fc47197e02ba680728363c50781d146cf2598403f4678781eabc4f4d2abe2c0bfe9a25065491d3cb514cc5a9dcee4edd9d9438f51181f43b2a
 AUX php-fpm-r4.init 1157 SHA256 37e34461babfb5881169f9729fbdde7d4aba533f123e2c480fe25ac3b863d3e7 SHA512 3555a2210104185b93b3805400995ed987076429c47b0950f58396c535d7ea99a5d2e7eedde071e2de06f4e248e0cb9bd27ccbf01b5606152a2f559fe874afbe WHIRLPOOL 6f5f0e45004275c7c984e68c293282db23461a64965b7d7c4a0ded682140177989ed50217aea6253178cc18fa9f9d202a69383400dc1a53271f00e85884849a1
@@ -38,7 +39,7 @@ DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf3
 DIST php-patchset-5.5-r1.tar.bz2 916 SHA256 a7543e530c2a1ceea4377560781c14012e9d0977235b324316221779bf34dc31 SHA512 9c3ae69ff17e8822e8dd75f5eb312448c89005ca3882d8fa9f948a88a05edb5ade481001e2c462f15ae73d54c8c1c3b0bc7e0f97ba379bcab1830e0c363ee374 WHIRLPOOL 98a2aa8cef8d41e9e01296e9c7cd864583092dbeb4de9868b6a4380dc02829b7c592fbee28e3e6aa5dd516fdfd865fdb229f33fe90ecbcd8cf6126f8b32062d2
 EBUILD php-5.3.18.ebuild 24974 SHA256 f9f67cd8599e7ab0bd6d229f92bdeb24ae2346081f1447874d8cbc2b60c3cf1e SHA512 3a4bae3c7e3e20a88f84cdcb19ed237671c9b0f1d0e15e00f299191942bd4a9b695d215a107dda2aa5944c67189d501b4eb8a84077ef06a613b3fe6ca3e159bc WHIRLPOOL 73c81f5c655f47b4f41eb93799e7a4d434201887764a36cd502d7cf7cd0364a7a6d77582c47aa109349120b945c8525925e713dc5a68620f81cad5c3e0c02815
 EBUILD php-5.3.23-r1.ebuild 21833 SHA256 5d706a78facb27aba7a92778b24496b7aaebb994673b175d427e3607ebde156b SHA512 45b2c34b69b548c96f96a030e785766b53d28382931c609df9ba3556202d88de540c154d7dc63848c2e1343251cf7b01a1044d92b845b1735d0be6599769f888 WHIRLPOOL b137d7807cd49c2a0fce22026014bd269c00b7ace3b945f2f0309758600c96bfdafac100dd6e8fa53c38001861c6a509b0b986f918a0c7f99d3ff3d6e6b88edb
-EBUILD php-5.3.23-r2.ebuild 21734 SHA256 5967d40b880a0bf5d7e5775e6220250918a46a7bf22355963ce8c6c6c0c91e02 SHA512 c15b23511eb7cdd0797c84a0b44ab53472c565a9361912a4d3cca6f0dbab35fb6373f8e452fc2bf2bac529121be401a37c626b8346e67d4f837ac092ea8089fd WHIRLPOOL 3289b846888ca973b28121c407ea26088f8eeaf7b642d33cd9190892db0762d9b2e38d3d1c53b38d623bdc083a60dd3eecab86f1189e7bdcebe2b30d5f72fdfc
+EBUILD php-5.3.23-r2.ebuild 21807 SHA256 6954ff4fe1e34153d023579f1dbd48ca4d77c9ac5e95fece7b014f3e8cb44bcf SHA512 215624c38d77aa0dd2b09e9833a4510ee2de5acf8333355550525d99bdfd0363167301e171cbc6be3c5b68ad91d6c3a2fcc195d32eef2d56a1a4d3bcad1a4620 WHIRLPOOL 40950c9bc9471126f70cba3f501ec7efb0c8a041ac4d0734810d4f74a3a64ebbb7dd992c595b68f7c3b69ccf12dee5b37690f8ed74fcb37c877a61e865b002df
 EBUILD php-5.3.23.ebuild 24612 SHA256 96dbc8f05152def8a29e2814fa6c6773b7c20abaa8075bebffe3b0601a23c872 SHA512 c3c54f3646ad4d0e327ccfe6acb5113749a4368ab0d0c7e22ec49ffea8c31148c17244a1cb933f16a370dd07a31109344ff201ecaf9336ee8c98a6e61cbc9bc7 WHIRLPOOL 07a4369f15024c30a555ea939ef234624984970cdac3ec90420d2c45cfb389514c9b528cd1946a5ad2338f1eebfd6579481fe45d9215a84b35ed4d4da295efcd
 EBUILD php-5.4.13-r2.ebuild 22143 SHA256 835aeff5627e3b8718acd1d3828bc4b170ef26bf5e0ff994a6f948a0901ae841 SHA512 dc4b45c95d223c14343c120a7fd896c13a65ef821601709a8cb7af3672344c7fff0fb348fe89e6a71dad7621c045c394781d7c60ac4b2bafdf6b6629d0048ed7 WHIRLPOOL ae1439e6bc7ca310becf6064424525288cc5f2cd40001ec70b10a7e5c3b42e7c0bed30c3400185e08d3eb3492049b0515aac98d7674c264dd1ad4be079318826
 EBUILD php-5.4.13-r3.ebuild 22043 SHA256 b3c16ade5689a2fc7a0e57fb299abe8ed8eaa5850553cccd8d22921879bd4f4a SHA512 5f12a0bc753fa6ff91e668db0e20bdd6a57725fc94a0f93e802202533f46f970d0ad87f4d53f38da9e41f15234e79e7a38da07dfeedc0d1894b44458c56eba5e WHIRLPOOL 77de10dba35487a5938763b29e229a27364a6a2d676497e61cca84b157dcf5f8bec182e2bff194e1dfa1e8fd3de4ad88fdfa2357d3becc48ad6238d09edcac77
@@ -52,23 +53,19 @@ EBUILD php-5.5.0_beta2-r1.ebuild 21961 SHA256 04139fcdd280422f0d4a1df90a56703ee6
 EBUILD php-5.5.0_beta2-r2.ebuild 21961 SHA256 56b1b8ed68d17f46ab18785c5a0017021b2dc6370a5a1c602621e23d9b5aa663 SHA512 8fed437ec1bf1ad649e81c4b1e121bd60a95881d86ea3374b20844bf36d5ecae8444b5c3e59eb77deb2e61196a2ac6ae5b796989c5f6d7bb7ba450cb1af02b28 WHIRLPOOL 7d2c816790251494b04a6d355622fd3097bfcd5e32c9c62a02079a63ec94c775e36816cc88c508053aa2cc724cfac8acefde6685938febfaa3aba35f129a47a1
 EBUILD php-5.5.0_beta2-r3.ebuild 21861 SHA256 bff53f010eed4a168fa75a86f33cdc1be0515b858ff74a61eab0825154665261 SHA512 69ff445343d634e48e2568aa0eeaecfff8f0f483c4d317ccfcb7e3d32d608d49818cc337e145e4052c2f2b8851a0cb1273af0c98d14c3b111053169ce3cebdb6 WHIRLPOOL 3a1d9a46029006dca5b4d353f13b58982837a18dd9d3c3f3bf2fbfcce84f4c56412db48d2deff23754e602be21b0a29bda35380c09a5c7ba7db42a6a40a09d66
 EBUILD php-5.5.0_beta2.ebuild 22031 SHA256 76025fd7aabf8ecca12370cb42a275e20ee32d60762aa2b5c5aec1bd964a167b SHA512 2446aedf6285a11ecab6370b8af60dfcb65516a5e0366a041a5123230ed0367ac7f609a1f81cec887872a7fc1a37e32628c6ffed41d6d172897f1ef4e7fd5015 WHIRLPOOL 0f8578fbd4cc28bfa2e50b2fc46253c219cc80cdc1183ab53f2aae2f0466b13d16a76daad85e5c2122d19dcbf7e83c82b076406e3b1ece2110424e3fcf02926b
-MISC ChangeLog 5814 SHA256 b086d8b7659230b565f64e3342cf08dc7774097463fbb7763737eadfcf9b8aed SHA512 db008dd461dd480229bc1b26c7530f74c931b0169e09cfc1a43ed460dea14e21fdcfdc03d8452414d464b279ed36158130c15691b18501c46f165256224be35f WHIRLPOOL 3b6f51bd16c86ef343546996967e895de0c4e241643e3d4f7484af89a7e0958a6b0fc9bd637c0587fb68db8db4779eab6f57feddd50ba15a7d70f9b632d674be
+MISC ChangeLog 5984 SHA256 a8a6bb5f9e86db4a77d5950b809a94f3e325222e16556a6efac8c7efeb0e229e SHA512 5865da7beab0dc56eb5d29f95d8861d1a8d6172b31d443d3f214d0ecdeea9af9a3fa556d793812448a925909178067d597f15dea2cb7dd867da413b4ff1bcd9a WHIRLPOOL 701172f50b906015397b18275cadc3f7f08022dbb371addc6bf84ce9013cc9c28213ca2391f7fbdb991d81e52f0a93a502cac9c43e9aa209ff388ea28cf11efb
 MISC ChangeLog-2012 108488 SHA256 c2eea36502d34eadc7995d546f78aaa553ba07beeb51ea738715ad7f2e51b08d SHA512 eb25224993eff1ea42ea133302991a3ffad3adda0bc524cfa4fae49574230a8e65b35b08750d780c11cc9c152435fadbf2c416241fac28dcbb025e060e96cd7a WHIRLPOOL 82f627853fa961f3f3707fb2c8757acbc8fc644e89121d78703b40ff0f668aa7d0f1aa26c77f8f503e4f6da22ed865e4cb7c02d5d112c89488b12aa6b0d80568
 MISC metadata.xml 1600 SHA256 f69cee357d251547d4e97cbb562ad6ab6b78383b4bcd8e183523b29a63c2f214 SHA512 2c7f74d61e6b9e86f9ece5981a26868316c4dc0ad759cc4eeacece9e33854d33d6265b4ee2d00e2e36baad6ec09ee916114f3dde6ded9cc9e45bef0c560e335b WHIRLPOOL dc007ba84a95d047f01d789302246033363bc412ebbdb75fe50e67088e91356c0c8cee76f2da59f771bbf99ad3f0113860852c82ac0ae5ad1c2a21a380e3ae0b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRWeKYAAoJELp701BxlEWfnG4P/2OhXU4SU0Czak5vZDDh0riy
-3r5KQDZgzq33n2wstNNIi/nmkdy0vNrrEThhK4I3i+MWfvrhqAcZog3R53zOWMi6
-IYet94f2fwdNdY08dzi4PkxqJ9jLsVGRqikjBA6ilUP9a8+ZaoR6B55auBKe3R6j
-s8U3/JlXTbdpSr27Bmu7+7xkqgSYYY67z6BYoR94s7Nv40vP5eXiW2YOVq0TcPjY
-CVu/iEUHKytem+XJmLFLgN7XlR7FVAqUB4t+nWnIk2vk/uBZadZ1j2iztNxqv9u3
-Oy6p6xdU597ibF4XfXB80g2W1d8r6WNo+D0A2lejm8nKPaRjGyamiulA42UoIweM
-c8R2n80O3+9wQP0YIHT0aM4SmVatbqovu4Ki0Yct8cjAYQo7RwrzHWbVAfo5ski8
-CtwEWoF9nZ88A7vDv9SKC4zZFUDnNuQMKVd79P09Mp/SvAB4h9tJnLuKe+/lM46R
-pxZMXd4I9HK6GEqJrxXqDY1ymIZ8SKCDzFp4M1BqmX2PRCIIDof8f9jb+F5mSL/+
-Kgxgc/905qmuLxzR3IhfdlU9RKKtEsMyIt7D0ottoAORil61vLba0hU33v/nfmjL
-P/lw4FpovK3MTuFGbICKm9z1vfS3R8Z/+OAmadW5/nsgVfwDzFBPg+bf0kpEtAHX
-+XwckRmhusiVTHXRnuq2
-=ELp0
+iQF8BAEBCABmBQJRWpLlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
+QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1s+YH/244YAeFOpiYuA7tSomHmpST
+SnDUFz3fAIuZnrK12stT/N6iz4bIW89t/yUYLr5Ju2ZZe977Ftgd3o5pFEJJO4PB
+vI1QnlyRaeLYg9r4/Vg6iK7epi/OYhIXZP3wok04U04lxgBEEyqDZt3qsBYNNj72
+UXho/AXDzMBsKX2kqmM2IHrD9XF/McnRAS2UqTKEw0XgG23aXcc0H6jXFb9dJCqS
+5DgEhAto7hkixz1DqsB0GwQPt30fj5nZZmX+BAOb3JBghzSVOOUtPw+uB4Wfs2dt
+1uqTJ1NC+TRI+SV48bm/TkdbiukTKBb2atgdgXU5J57mYltHdMHcZx9p0Tw8BZE=
+=MW/M
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/files/fix-libstdc++-underlinking.patch b/dev-lang/php/files/fix-libstdc++-underlinking.patch
new file mode 100644
index 000000000000..a35305a865b8
--- /dev/null
+++ b/dev-lang/php/files/fix-libstdc++-underlinking.patch
@@ -0,0 +1,10 @@
+--- acinclude.m4	2013-04-02 09:58:33.069274096 +0200
++++ acinclude.m4.new	2013-04-02 09:58:25.221240142 +0200
+@@ -762,6 +762,7 @@
+   if test -z "$php_cxx_done"; then
+     AC_PROG_CXX
+     AC_PROG_CXXCPP
++    PHP_ADD_LIBRARY(stdc++)
+     php_cxx_done=yes
+   fi
+ ])
diff --git a/dev-lang/php/php-5.3.23-r2.ebuild b/dev-lang/php/php-5.3.23-r2.ebuild
index f7daa7d836ee..afbd6b3a7685 100644
--- a/dev-lang/php/php-5.3.23-r2.ebuild
+++ b/dev-lang/php/php-5.3.23-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.23-r2.ebuild,v 1.1 2013/04/01 16:08:22 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.23-r2.ebuild,v 1.2 2013/04/02 08:12:17 olemarkus Exp $
 
 EAPI=5
 
@@ -296,6 +296,9 @@ src_prepare() {
 		EPATCH_FORCE="yes" \
 		EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
 
+	#Fix bug 463498
+	epatch "${FILESDIR}/fix-libstdc++-underlinking.patch"
+
 	# Patch for pkg-config-0.28 (Bug 455040)
 	epatch "${FILESDIR}"/missing-openssl-include.patch