Fix custom ./configure script for -Wl,--as-needed wrt #278158, thanks to Diego E. Pettenò.

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

4 files changed, 49 insertions, 6 deletions

diff --git a/media-sound/aacplusenc/ChangeLog b/media-sound/aacplusenc/ChangeLog
index 821bab40f728..77c2eee89ed7 100644
--- a/media-sound/aacplusenc/ChangeLog
+++ b/media-sound/aacplusenc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/aacplusenc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aacplusenc/ChangeLog,v 1.1 2009/07/12 00:06:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aacplusenc/ChangeLog,v 1.2 2009/07/22 19:54:56 ssuominen Exp $
+
+  22 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  aacplusenc-0.17.1.ebuild, +files/aacplusenc-0.17.1-asneeded.patch:
+  Fix custom ./configure script for -Wl,--as-needed wrt #278158, thanks to
+  Diego E. Pettenò.
 
 *aacplusenc-0.17.1 (12 Jul 2009)
 
diff --git a/media-sound/aacplusenc/Manifest b/media-sound/aacplusenc/Manifest
index c1718d540996..31b3333f6d3c 100644
--- a/media-sound/aacplusenc/Manifest
+++ b/media-sound/aacplusenc/Manifest
@@ -1,4 +1,5 @@
+AUX aacplusenc-0.17.1-asneeded.patch 909 RMD160 cb2ac9c185cb25e7bd7ff2d92a38e8e3596fd57a SHA1 8e2d170315c8d3779d26045c6ffd0f5a67624716 SHA256 1e2adb61dc687d591475ba0358b02cf9a74442b581743db29466e7645d980397
 DIST aacplusenc-0.17.1.tar.bz2 175606 RMD160 9c60013d5f6a24c1821575b69a85c8870c00a55f SHA1 47a88050adb254dd8d4fe7fc3e2585f939aa3869 SHA256 e9740f3e158ed247eb7ea8f3b2dcd3e523b05b9d138cf62232d70ec52f4ba8da
-EBUILD aacplusenc-0.17.1.ebuild 1134 RMD160 4e09eb3258f11b878b0637cc791e213c6ed89f3f SHA1 42e5deae87323ec19d7e90bda67e3d18dfddd3b0 SHA256 51090c2aabae59b577e5124bc32583fa2045618fbecf7a0a95b144f365816418
-MISC ChangeLog 356 RMD160 aabfd03b91293f220905cfcb8b9cbf65d2501166 SHA1 e5237dc84dfa61110800f18df116293a1f77f69b SHA256 428447c90522dc254f4674f37f51b54415eeebf4c363bc5d4e999b4ec630153d
+EBUILD aacplusenc-0.17.1.ebuild 1160 RMD160 d1c7c62ebc27744cb66a6bf8db3316a2b6ac15fb SHA1 96093e808be0c7d2a3546ed92f9b0db45415a9f8 SHA256 c70c5200636c08e6c44eede0e51173eab10a48c46c8989e35d0d5a0feee8b6a8
+MISC ChangeLog 576 RMD160 1b9750636eab36dd06ef7c225d5e4ea830a6f629 SHA1 84db6cae060bce4e7726b79d29bfd4d4c2b41015 SHA256 83c69374776fabd1a6b4d2964c992678b18340ca0ad6122ffeb03658673be3eb
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
diff --git a/media-sound/aacplusenc/aacplusenc-0.17.1.ebuild b/media-sound/aacplusenc/aacplusenc-0.17.1.ebuild
index 8df1aa3ff6a2..8c646d4e4466 100644
--- a/media-sound/aacplusenc/aacplusenc-0.17.1.ebuild
+++ b/media-sound/aacplusenc/aacplusenc-0.17.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aacplusenc/aacplusenc-0.17.1.ebuild,v 1.2 2009/07/12 00:25:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aacplusenc/aacplusenc-0.17.1.ebuild,v 1.3 2009/07/22 19:54:56 ssuominen Exp $
 
 EAPI=2
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="High-Efficiency AAC (AAC+) Encoder"
 HOMEPAGE="http://teknoraver.net/software/mp4tools/"
@@ -22,9 +22,9 @@ DEPEND="${RDEPEND}
 RESTRICT="mirror"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
 	sed \
 		-e 's:LDFLAGS:LIBRARIES:g' \
-		-e 's:gcc:${CC}:g' \
 		-e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \
 		-e 's:ar r:$(AR) r:g' \
 		-e 's:strip:true:' \
diff --git a/media-sound/aacplusenc/files/aacplusenc-0.17.1-asneeded.patch b/media-sound/aacplusenc/files/aacplusenc-0.17.1-asneeded.patch
new file mode 100644
index 000000000000..7db77f840d3c
--- /dev/null
+++ b/media-sound/aacplusenc/files/aacplusenc-0.17.1-asneeded.patch
@@ -0,0 +1,37 @@
+diff -ur aacplusenc-0.17.1.orig/configure aacplusenc-0.17.1/configure
+--- aacplusenc-0.17.1.orig/configure	2008-02-14 18:28:24.000000000 +0200
++++ aacplusenc-0.17.1/configure	2009-07-22 22:52:16.000000000 +0300
+@@ -8,7 +8,7 @@
+ 
+ echo -n 'Checking for libfftw3f...'
+ 
+-gcc -o test-fft -Wall -x c -lfftw3f -I/usr/local/include -L/usr/local/lib - <<'EOF'
++cat >test-fft.c <<'EOF'
+ #include <fftw3.h>
+ 
+ #define N 128
+@@ -29,6 +29,8 @@
+ }
+ EOF
+ 
++${CC} ${LDFLAGS} ${CFLAGS} -Wall -x c test-fft.c -lfftw3f -o test-fft -I/usr/local/include -L/usr/local/lib
++
+ if ./test-fft
+ then
+ 	echo OK
+@@ -38,7 +40,7 @@
+ 
+ echo -n 'Detecting endianness...'
+ 
+-gcc -o test-endian -Wall -x c - <<'EOF'
++${CC} ${LDFLAGS} ${CFLAGS} -o test-endian -Wall -x c - <<'EOF'
+ #include <stdint.h>
+ #include <stdio.h>
+ 
+@@ -76,4 +78,4 @@
+ 
+ echo '#endif' >> config.h
+ 
+-echo 'Now run make'
+\ No newline at end of file
++echo 'Now run make'