Make '-z defs' a linker flag explicitly (bug 395213)

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

5 files changed, 35 insertions, 19 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index 317ccff47ea2..84763ed604b8 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/audacious
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.248 2011/12/07 13:47:38 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.249 2012/01/17 12:55:52 klausman Exp $
+
+  17 Jan 2012; Tobias Klausmann <klausman@gentoo.org>
+  +files/audacious_ldflags.patch, audacious-3.1.1.ebuild, audacious-3.1.ebuild:
+  Make '-z defs' a linker flag explicitly (bug 395213)
 
   07 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> audacious-3.1.ebuild:
   x86 stable wrt security bug #383991
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index b38f85db15f2..a5960424cbb7 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
+AUX audacious_ldflags.patch 392 RMD160 270aba025929c216069e71b9b18edab76093a5c2 SHA1 358d3f3784e7a1563a6e3237dc318b5262f2a33f SHA256 b50f57ccc80ab472876b2a3726a5d894be11f5b6bfc70ac1411ece67c839d767
 DIST audacious-2.4.4.tgz 1344519 RMD160 75c960b158b3b6367cca4a7da65d98d8a35a13d9 SHA1 697b2cc217cef9785cf7ec0c4ee617bc174fbe98 SHA256 76f84038a0360da80aeaddd1ec23e5a55fee5a120abffce97c4609958cdb30e8
 DIST audacious-2.5.4.tar.gz 1221134 RMD160 40c4482a0ed35c76e214180cf5c3a308b4d83d7a SHA1 6374b09690fba540b82f7fbaa9a4d763c5ea7d79 SHA256 47bc36010e84c2c9638537a42a8451743d55a699bf85c614f3b913596f6e2fcd
 DIST audacious-3.0.3.tar.bz2 839693 RMD160 d387b155ee5a6a859b4b443bfc82f45e1003d3ff SHA1 f8e547fc9d743da0eba591395d353bae8b73facf SHA256 141d1963d6c44be3d140a43a5c01ebe9db588e5d9f29049a4819f24448dd3cf9
@@ -10,14 +8,7 @@ DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d
 EBUILD audacious-2.4.4.ebuild 1761 RMD160 26538d3751242ced3ab13cc0b7311279453af931 SHA1 634cea8403b0cb84779153a3fad24d0e83304ff4 SHA256 a78092e6ae76bc34a04214b3b6bb7d66768c9e1fef9180840c5dc8d22ab971e1
 EBUILD audacious-2.5.4.ebuild 1756 RMD160 1389296e7a865fd293a8083d13d794f76ccac285 SHA1 baa0b7f150de43aaf5498523c90588e490e49eaa SHA256 e30a758b880af656befa1f53ec9d4098fc71c2e9b69fc85d162b8e53c80c89f9
 EBUILD audacious-3.0.3-r1.ebuild 1809 RMD160 b2497984a863c4fdf016dc3f48a5b3f31bde403b SHA1 996ffdbfa7777d313f453256165ce742ea79f9c5 SHA256 f1e3b269132f6a5d8f1c63920ca72fadeefedff384ff099043545de6fed65d21
-EBUILD audacious-3.1.1.ebuild 1812 RMD160 c85861e40d9486c9a8e7f6f6489e4edafbc2cfe0 SHA1 7681d39d8bac14972b4212419b0de9dcf74d2aa9 SHA256 ba7e6258d18d83662d6dc6d58ded5d768c1c2075bf037eca7287067b3746429d
-EBUILD audacious-3.1.ebuild 1801 RMD160 f380a0772c77ded42dd6ffec29c2cdf001203b0c SHA1 e1da238dcb7a9c048a608c8ee316e616cd19ea98 SHA256 9cf14ddec9effa900ec56617e710e1ebb01b4ea2a07657b83d8ecb49ae82b266
-MISC ChangeLog 43301 RMD160 630cba90f75da5ed9dff4b9fa77570c901683afd SHA1 70203dcaa0be7014bdeab1dda106bcb5b35576e5 SHA256 04d6886387f82a171311859400abe761ef064389d323d390519103c95a14b3dc
+EBUILD audacious-3.1.1.ebuild 1981 RMD160 a3a2ffdfc185abff4349233e06c0b38a3720274e SHA1 4a593812993f2349882ec0a1a56b4b9899b297ed SHA256 ebe29b20272cb728aefae4a842cc9e904f6e4c4bf58987cc377ace915ba83b4f
+EBUILD audacious-3.1.ebuild 1968 RMD160 6f4d7f77e1c3684c1c18116b9b0b2cd22521ecd5 SHA1 efe0ada9c3407d946715c1dbee58b4cee6ec28b0 SHA256 272407e4146f8f16fb5cfddb27b00310ee94c42275ea88726deaa25cc1497ea3
+MISC ChangeLog 43489 RMD160 478011d7834473f11f3786195b7eea9fabfc8bb3 SHA1 3aeac5d5ab909c2df12cf735f17f0e46dd754529 SHA256 95c9c626e22f198226e9cb3b90f881f4eda6b29f08ddabaf919571918b06efcc
 MISC metadata.xml 363 RMD160 fba132fb7596814a0d7e42330a5703dc4afa32dc SHA1 2a77afacfd9e5628bd59bfc6332320302d3a6387 SHA256 cc833502f2ab5b13e4b22684d0f7bec07804c3aa2daccaee913297853e6e5b07
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk7fboEACgkQuUQtlDBCeQKLQgCfX+pZiLcjGclbLeAbpXGHzmgW
-6qMAn0dz03UZ2+IvEmjNG4mRyKM1EwF1
-=2xpg
------END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-3.1.1.ebuild b/media-sound/audacious/audacious-3.1.1.ebuild
index 8cc3c5033e03..6f1b4d234bc4 100644
--- a/media-sound/audacious/audacious-3.1.1.ebuild
+++ b/media-sound/audacious/audacious-3.1.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.1.1.ebuild,v 1.1 2011/12/05 22:46:56 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.1.1.ebuild,v 1.2 2012/01/17 12:55:52 klausman Exp $
 
 EAPI=4
+inherit eutils
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
@@ -34,6 +35,10 @@ DEPEND="${RDEPEND}
 PDEPEND=">=media-plugins/audacious-plugins-3.1.1"
 
 src_configure() {
+	# Some gccs don't like "-z defs" on their command line. Explicitly make it a
+	# linker flag (bug 395213).
+	epatch "${FILESDIR}/audacious_ldflags.patch"
+
 	# D-Bus is a mandatory dependency, remote control,
 	# session management and some plugins depend on this.
 	# Building without D-Bus is *unsupported* and a USE-flag
diff --git a/media-sound/audacious/audacious-3.1.ebuild b/media-sound/audacious/audacious-3.1.ebuild
index 6f7278e8c88b..083f9fdfd9c4 100644
--- a/media-sound/audacious/audacious-3.1.ebuild
+++ b/media-sound/audacious/audacious-3.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.1.ebuild,v 1.4 2011/12/07 13:47:38 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.1.ebuild,v 1.5 2012/01/17 12:55:52 klausman Exp $
 
 EAPI=4
+inherit eutils
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
@@ -34,6 +35,10 @@ DEPEND="${RDEPEND}
 PDEPEND=">=media-plugins/audacious-plugins-3.1"
 
 src_configure() {
+	# Some gccs don't like "-z defs" on their command line. Explicitly make it a
+	# linker flag (bug 395213).
+	epatch "${FILESDIR}/audacious_ldflags.patch"
+
 	# D-Bus is a mandatory dependency, remote control,
 	# session management and some plugins depend on this.
 	# Building without D-Bus is *unsupported* and a USE-flag
diff --git a/media-sound/audacious/files/audacious_ldflags.patch b/media-sound/audacious/files/audacious_ldflags.patch
new file mode 100644
index 000000000000..e030b1af5dae
--- /dev/null
+++ b/media-sound/audacious/files/audacious_ldflags.patch
@@ -0,0 +1,11 @@
+--- configure.old	2012-01-17 12:41:09.000000000 +0000
++++ configure	2012-01-17 12:41:42.000000000 +0000
+@@ -4759,7 +4759,7 @@
+     *linux*)
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-        LDFLAGS="$LDFLAGS -z defs"
++        LDFLAGS="$LDFLAGS -Wl,-z,defs"
+         ;;
+     *)
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5