drop -Wl,--build-id from LDFLAGS, bug #465466

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 47 insertions, 18 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 5eadd1b93f39..ed0ba66638f9 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.247 2013/09/25 15:16:02 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.248 2013/09/26 15:02:50 axs Exp $
+
+  26 Sep 2013; Ian Stakenvicius <axs@gentoo.org>
+  +files/moz24-drop-Wl-build-id.patch, thunderbird-24.0-r1.ebuild:
+  drop -Wl,--build-id from LDFLAGS, bug #465466
 
   25 Sep 2013; Lars Wendler <polynomial-c@gentoo.org>
   -thunderbird-17.0.8.ebuild:
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index fcf5c403c633..30c4d6607722 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX enigmail_mailnews_extensions_genxpi.patch 800 SHA256 8f624af88ee4c3c6c9022e560c2a0155dff6ac16d036dad2dd7d26adb9c63109 SHA512 4a488e732c1d49775475baedec45438c4ab9677b59556db23ff98ec42a424074bb4538ea3826879365d2a19c58ed877f56185a41c8a933ed79cf8cbe0cd158a9 WHIRLPOOL 02f785f6f10fb44ba578d55752b06cfbb4107f13727ddddfd55a92ebb690c58cf405d46fe4b4037da3c7b83db5157d11ac4112c7bdf9da6faf8a689c5824563a
 AUX icon/thunderbird-unbranded.desktop 228 SHA256 9c3486c4944c7a7471ae5d5f6ab8b716a9e51ad677d140b7ef58de99b9a7f334 SHA512 adb886d443fbd01c3c0b34ef4ad8eb7e790eb81dd8c6bee347a03061742dfa1a4ffb5137e0451253ed60a28eea5a752175a51e41c21ae0bff6a0673d056b3c70 WHIRLPOOL 851d5428ab36bd0622529f7ac9c54ab22ff1729d78a2ba185d80efd2f8ee105401c3db26229cc55bc7e28cd5f63c21e62703e94b60396e8c61575d514a6d5567
 AUX icon/thunderbird.desktop 218 SHA256 5fd4cd2b2a41cf8e526e16fa26a1b17292a9df9ef314bbb768057e921679898f SHA512 0ab09379603c90f53fabf7b41a4e3281191b7ceb8f8c2f64cada5ddc83d72a9032534c9a39fa9b63f5945f89d277b41ff15f7e20e44bb3e8fcb0348ddd450828 WHIRLPOOL 0dd5f139c30f0b5b18b853d5781ad55e775db6367dff393ab8984ff76a2bb5533b34fc4d2088cb750420178d85dfa2d7ce3710fdff95f3b932258a3e4267beaf
+AUX moz24-drop-Wl-build-id.patch 1243 SHA256 5930c1afd86689723768afa0eca529995addcb7abd3bd4eb9de2cc65fbc722d6 SHA512 8d3678d0b434b880e89cc7fdfccef1601a12f50bd491eb7c64c17e7189ab10b0939a4236cccde28129761d9b3417e0e6b9806cd4150ed93e790ff3c0c0337e13 WHIRLPOOL fd918031604782a12e2a8e194cdc67aa11cb0285500e6e8db67583d42f7693227d1f4b496aaa30ea605fd53b64aab5126c32a6e0a8b83e02bb4de1a55b662723
 AUX thunderbird-gentoo-default-prefs-1.js-1 426 SHA256 b5aba51045c700ae4d465e079f3e776600d4950806212f7c2fe1841fa25cf9d6 SHA512 b40e7b4789b7f43c382589f7d0eaa6043072bce86ab79fb3dda4800e9ab6a43af11f43b0cb3b6ab1c71d887aa1cf9356ac858f0a81dad013cef5b8a4b2107983 WHIRLPOOL cc3535e9a710d55c5386db51d7bd6ca24f6b36685a54e42d049a806fe99fd0b08afe7998d1478036bfa306129616778b8ac1386e14649646fc0a7ae4d37b830d
 DIST enigmail-1.5.2.tar.gz 1211395 SHA256 f20d6d1be1ab12dc2f1208d8f01227fd7e5c4dcf5d6f4bd0833a932b58973a26 SHA512 21df4726b203c5840134eb925df79c8bcb06b201217000fc636cf43b6d7d7fc8850c90de8998838f3d07b02e027f7cab09b719d600d034c4110cce6befd690c5 WHIRLPOOL 496320d20af8b8254d55976a269cececd27efc8d948cd85c016b4a34bab5f600a9698f423a6dae4f003fa2020ad6e7e475d2c1a1819f529b14e7bd13d26aaa51
 DIST firefox-17.0-patches-0.6.tar.xz 52684 SHA256 780d7aa5990e39ad105b21fa2584379357749e0eb16e0eaf9be66464a02f3de1 SHA512 56fc3970233e144bea5f6d6be6fdc7c17b1095172dc600c02be4a0cd3764958480e934a0b2ce1ab2a3edc237ece9cf1b7a2f7914828e6c5a3f519860ea2a5b5d WHIRLPOOL 4e2bdb64dfb23f66bec5bf41e34d61aff22e4f7bc14c7c981077575364c8a5aae889d941b99fbf21d248854648b70f6e4c2e6a2e06ab70b1d4495d539e2962a4
@@ -121,23 +122,13 @@ DIST thunderbird-24.0-zh-CN.xpi 449181 SHA256 68415dbceda3caf7900a8e243c5b044e69
 DIST thunderbird-24.0-zh-TW.xpi 450000 SHA256 a0c8877af5dfd9b7b3add1626e3fa01ddaac7b7648fbc1dbd23eb1f0660da537 SHA512 6b198750d9bb28a8c00deb9190c39ac89c276b65c21aac1c6e66bb91be739a1933ed5d82b157119d5e4eed3e4932194246f4ca063056272df47b1ea8e63a51a3 WHIRLPOOL 3bdb2d2f14eb73b46149300442f57e41dde583c70eb0e2b5aa0104a6abeec25cf97c279969ba7a19b7497a3db12cd7e2b3d9e1dfcfa5b96c88cb7bc4374d5f00
 DIST thunderbird-24.0.source.tar.bz2 140334722 SHA256 60a1abde987a61c8096e431f13df2ba2cf188a22fdbf1712aaec795b302a5ff5 SHA512 5de3333b65be89cba1a2a0fa8ef24142bacc29e66ab2f83b705e0496aa298dd6c990049640471c51642f0fd9a857b6e5bba11282296bf548c89f8e667b05d7ee WHIRLPOOL 48398e670f9d04b50989bae69d976587ffafe8bf29ef72acba6c6794afaac788bb0899fe8630d95599827c963b34f8e30b1d92d988c73cdd8e85f57625ab1161
 EBUILD thunderbird-17.0.9.ebuild 11160 SHA256 1c0e4000a12ac729275cd22ae5873d892cbee9850699536267f564dc6d9fb653 SHA512 30fb8a5bb31d7b8335e716bb157b65ae1b0d68e01425af9b507fedbd44e0a071371e171d556c34e793a3fdd7ff077f3a74b08e131d356ad2c0c0525e7bf9c794 WHIRLPOOL 87cd21a3297a745fa6035ac08b8ecd66083d0f97fd37a59eb365d06687a5d0de97c41ab26a4d939aff4ddbddf65bb39952036fd1677bcdcb30f1e5c873320638
-EBUILD thunderbird-24.0-r1.ebuild 11076 SHA256 11d8df8ad5ae49cdad3c7deac0771fcc1e5c7c1383c582c498c2b570fa325ba0 SHA512 b7f8089944aea778688157f9646127ce80df9c468ac9b04e06a68ef6f09f7975e1a7e3225d855b211755c37f2bf133a9fff80617f12d3945792420abd6146521 WHIRLPOOL 734ed91bff2e5859cf1a21fd7c595659c8b71cddf087cdabe8264c9077a079b7780f5162f4ef23e06d940da30d47baeaf89ab9f10c3ee8a110a967607cab61c1
-MISC ChangeLog 88194 SHA256 4fc5a37fdd7d3587de0a156a3e81a7ae0c486f1a6e2f8f023e5693b971066aee SHA512 cf1f511e07a8d0d845a899af0550480cf8f047520e822faf5f966ff0aca39974395ec6e339e5b12ec6dd745f369d592758a47b83045fbbe2a0d188fc8f5c20b8 WHIRLPOOL c67356d24c898f42eea845a014ec982c0e54cbe313f9d60f5cd558a54081e374e2f5ca1e74e6a65ee43380b6284402e861d166a9bc80a13eebb4e9214c67becc
+EBUILD thunderbird-24.0-r1.ebuild 11180 SHA256 1eb487ff1dd8f4cbe15bf370799b60faef5acde90189d44a2c665933194fb57c SHA512 25ad046d90e235729d5d48ad0cdae7ae4981c5c8feff3b8ee80b68ee0a39453e1f190d47d0aff9ff63b97b0a11aed3d9eed8fc4a8a8720ed5857d2b579e51269 WHIRLPOOL 91cdeb9aa63a4b82e5129d15ab0d005a283768d5336596a4b54c122f33f85be0e2e9c38f0a0f3ad08f66f5259f7e0e872460b2afb17f125f03c0af71e845c911
+MISC ChangeLog 88350 SHA256 d9fa473c4899434c9d00192f48616f5accbc04d0993056c5da0d62177cf295a7 SHA512 ed64fa6e7db18cc174a07860b5fed1516d63a2efc0eb0228c36770311b6080d317a0d97bf5f8eb37bbd0e19d88172dd820e353ee87d938e641cbb31a955e4df4 WHIRLPOOL a68a3d9569eabd262752fa0b27bfdf365733c6df997cea17c765bd567185ab24d8c4946b0942e577425569b1c24fdc8236973aa3e86dc30f26760741d04d9362
 MISC metadata.xml 1308 SHA256 cd7f5c6937738ef5858a409ea3186bdea6a6d27f8e338ff12ca9019a24dc6111 SHA512 0cffc220689a5ecb7a9021c782cdd1ff826b160d48f886878922f9df84241018a36f7091c21e503246a1689d1bac8f6da0ff64743263db348df52d08f00ba82a WHIRLPOOL 1802f00f70287a79a6b25ba0d40b92446db1be73a1788326863a7c8c13f4995ef9eb875431a459f2eb5bbc574276676fc50305c508f56c46417719037be5d670
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSQv4zAAoJEPiazRVxLXTFyrYQAMKmcRXqOlIRPjQkv0GprJlf
-GFOvOiczBXANgtSDMfTMOcj6jbl5JQ0zN+XE2mddIDArIC/uIbAAxsvnK/txMUmF
-pvJQyzepB/oHA4Vd+Ff/vd1kpolNxmrowJQXWcnsPL6PvVfEVcT4p2oLbzZqV0e1
-+BEQ0NzcTpqb36sr87caBqXVPGvLmiVqHP4mGzyWI7apPbJo2/z3pPSE1J8Cg4ky
-rNCp9sqV7UDTyu/nrR3/HamEDF027fsHeTAX76FL/Y06zfFy2g4Wl/1lpPa72Mzc
-7q1i8DuEqWqIPzV9qkgK749hKNv3IjbyW/tfefNOz18YNYvXvWXL78dF/HgANS+p
-xChE8kD7ngF7YkzW+yhVAhfJ7ooiqeCSpYrgbhcv93kIotd4emzAL8R0CBmKoJX2
-9gpKipmyXESD7nxcY3VG3ArTKJck0TDUFQlMz/jWkk8s5FW2oUn2iV5C294ALmuN
-r6ZwHWUY761SgYqIX/YYr4ShaoSfma8BsLky2CITRZ/QC/GH9jJMhuK3whTSacPb
-R51T33B2uLZzix6ZMNuUFlcvhzPmJz+et0iGpvsgscpgpFpBQ3ZCcW12juldqrZX
-ieGEbaw7MupN9GQLnVhOC7rpSwYHcu5tx6rrDm5EWxP8h6LF8MALfEMGh8wBSURy
-NTZIZ6XMMxaUApT7Hsh5
-=U5AT
+iF4EAREIAAYFAlJETKMACgkQ2ugaI38ACPBbkwD8CE5fxYZ5WJWUDetvaR6hckh9
+UsWehp4/dekDk4PTJw4BAKbEra4ZYwzDhnw0IOu0Gx8u/EGgXCl/Dl2ea6TDMeUP
+=Kl+x
 -----END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch b/mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch
new file mode 100644
index 000000000000..434dd238a961
--- /dev/null
+++ b/mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch
@@ -0,0 +1,32 @@
+--- a/comm-esr24/mozilla/configure.in	2013-09-26 09:41:27.220542321 -0400
++++ b/comm-esr24/mozilla/configure.in	2013-09-26 09:49:07.888550730 -0400
+@@ -1339,13 +1339,6 @@
+     AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+                   AC_MSG_RESULT([no])
+                   LDFLAGS=$_SAVE_LDFLAGS)
+-    AC_MSG_CHECKING([for --build-id option to ld])
+-    _SAVE_LDFLAGS=$LDFLAGS
+-    LDFLAGS="$LDFLAGS -Wl,--build-id"
+-    AC_TRY_LINK(,,AC_MSG_RESULT([yes])
+-                  [NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,--build-id"],
+-                  AC_MSG_RESULT([no])
+-                  LDFLAGS=$_SAVE_LDFLAGS)
+ 
+ 
+     # Check for -mssse3 on $CC
+--- a/comm-esr24/mozilla/js/src/configure.in	2013-09-26 09:41:27.222542321 -0400
++++ b/comm-esr24/mozilla/js/src/configure.in	2013-09-26 09:49:19.121550935 -0400
+@@ -1154,13 +1154,6 @@
+     DSO_PIC_CFLAGS='-fPIC'
+     ASFLAGS="$ASFLAGS -fPIC"
+ 
+-    AC_MSG_CHECKING([for --build-id option to ld])
+-    _SAVE_LDFLAGS=$LDFLAGS
+-    LDFLAGS="$LDFLAGS -Wl,--build-id"
+-    AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+-                  AC_MSG_RESULT([no])
+-                  LDFLAGS=$_SAVE_LDFLAGS)
+-
+     # Turn on GNU-specific warnings:
+     # -Wall - turn on a lot of warnings
+     # -Wpointer-arith - good to have
diff --git a/mail-client/thunderbird/thunderbird-24.0-r1.ebuild b/mail-client/thunderbird/thunderbird-24.0-r1.ebuild
index da40020d0aad..5d6b836410ea 100644
--- a/mail-client/thunderbird/thunderbird-24.0-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-24.0-r1.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/mail-client/thunderbird/thunderbird-24.0-r1.ebuild,v 1.2 2013/09/25 05:08:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-24.0-r1.ebuild,v 1.3 2013/09/26 15:02:50 axs Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -122,6 +122,8 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/thunderbird"
+	# drop -Wl,--build-id from LDFLAGS, bug #465466
+	epatch "${FILESDIR}"/moz${PV%%\.*}-drop-Wl-build-id.patch
 
 	# Apply our patchset from firefox to thunderbird as well
 	pushd "${S}"/mozilla &>/dev/null || die