Fix compilation with --as-needed (bug #424067), properly fail on build errors and output build commands

Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64

5 files changed, 68 insertions, 20 deletions

diff --git a/app-misc/tdfsb/ChangeLog b/app-misc/tdfsb/ChangeLog
index 344a8185be3b..1f78c442d446 100644
--- a/app-misc/tdfsb/ChangeLog
+++ b/app-misc/tdfsb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/tdfsb
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tdfsb/ChangeLog,v 1.25 2010/09/16 16:31:14 scarabeus Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tdfsb/ChangeLog,v 1.26 2012/07/16 12:28:19 angelos Exp $
+
+  16 Jul 2012; Christoph Mende <angelos@gentoo.org>
+  +files/tdfsb-0.0.10-debugging.patch, files/tdfsb-0.0.10-asneeded.patch,
+  tdfsb-0.0.10.ebuild:
+  Fix compilation with --as-needed (bug #424067), properly fail on build errors
+  and output build commands
 
   16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> tdfsb-0.0.10.ebuild:
   virtual/glut -> media-libs/glut
diff --git a/app-misc/tdfsb/Manifest b/app-misc/tdfsb/Manifest
index b2ed41954640..aac2ecf5bc46 100644
--- a/app-misc/tdfsb/Manifest
+++ b/app-misc/tdfsb/Manifest
@@ -1,5 +1,16 @@
-AUX tdfsb-0.0.10-asneeded.patch 2020 SHA256 b7640fdaa6a9ca005ee3e699f6737b31054c149a7f34f429680cbd2e7d2d0151 SHA512 d2aa5bb1efad7fba00e260dba445c6f0bbd6d4ac9a3f7ed5c32784f73adaa6da9c08cd2c39f8cb6681d605dacb7df0f3a8151a64d958531096687cf6ebd747c8 WHIRLPOOL 777b74aafe4d793759720e803c0f59c400630d44e28906f0432645108b20c9f8ec37d093d6a0ca309f4c3546f9f9d0c69fb2630f317cb78a1c322c6d091dfa43
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX tdfsb-0.0.10-asneeded.patch 2009 SHA256 f691a9cec718fe03336d1faef4c17e84ea07174a57b7944ce14e15e9c5d559b9 SHA512 cc6daffb087df7cd75986de69240e19a762db8a8c42621d1b8b5fe869bdabe676e3748b2387212362eb2854d7f7dd74bd085671372d453eecaa8cd38f91962d0 WHIRLPOOL 6e479b7b03bfeb0012368658200bc076c1648fa21e2ec94dcb12cca4b03871f3f238d9b33cd043475ad99b1b0aeef92fe4deb239bd4bb3a8d19cd2a9a604cd2f
+AUX tdfsb-0.0.10-debugging.patch 2106 SHA256 c851aca220dbbdf2805ec1f1660a59fe9ff2eeb4ce0d7148654d1d034b365cbd SHA512 eda59ad82597f819ea6458c096dfdb2c27ae35be99961cd72135f98f189ee428aa5f198bc4098350cbd0690852f8693003a074fe73e904f16827be4b2ebe931a WHIRLPOOL 21d2024d82a99897e31f97fa0a087d0fdc88494e023bb4ffee797e963e33e46d2650390890a489c882eb5cb0d1ddc9587e3af574896bff4f6b42df8d035f8bf6
 DIST tdfsb-0.0.10.tar.gz 35630 SHA256 91283a0863f7c38028346ab4edfd180d0ce6cee3f1a7c44bf3c181a74063f4c3 SHA512 4bfde530761bbc8373f2a9cc8bc5a4ea721ac564e7440d67ebf0c8b019c553b2e1288db86e54aaf111253decdbd4df93ea812fd5a70fd95acf11ff702387a7eb WHIRLPOOL 4058bbe99eb6d6e0bfba5d36e062c2e802285e0e99c5ee622f767fb898c82ca6f3e40d96107b9417013aca8a63158cccabdee4e120cc78f0c304c56074263969
-EBUILD tdfsb-0.0.10.ebuild 875 SHA256 39aae90927e9e76f0cee4bd4d282ac4b667ecebdb84f254ad812a13a850fe571 SHA512 b27ebcfecd4d733a4e0ee14898e0e9d12cd1adf202ad9670b9c1eb6a9eeddbaea54850e9e3fdbc23a2ace842c3e173746f25e5d4f98ce10198ed4d8054f1743d WHIRLPOOL 662623cdc02aadd5f6c59f1a4720645978ca45afe67cf397618fdc90085aa7ab6fd824b6373e7655038d2ee7f7af2499fe659d27040578917fb4144756ef3046
-MISC ChangeLog 2775 SHA256 a52c0ff45cc8f673a9528dd4e68fcfa2e27c85386f19d7bddbcf0c3d79598bc5 SHA512 13376d216cb00bdc715a00d9e7fff7560eb71516c8d66f5c98a38d4225600d00d4cd4b3b3e383698633d382e9b46cae7438c1393461dbbe65056cd765b0fbe78 WHIRLPOOL 7404e577edf3778e49f51578cc03b13198a8cc049785cc97d167e18c6fd84f973a9b4efc5495a0d794953ad829149d8a19e657057f142652896e0493f3312d32
+EBUILD tdfsb-0.0.10.ebuild 898 SHA256 6cb604ac6466dd5bf59f1ed7294e740d672dadafcb7deb6fd2236411ed01e9ea SHA512 9c2b96dfa76e22526912d7a537e5f3bfa8cc38e44e6d1bcd2bb09de81d3e954e7b0e5031eb310191e57ba2117e5308f52a64a394f96addfe741fb42a83946bcb WHIRLPOOL f5ea9ebdc9ab686ed319d3430e2ff243c6c7e0de96cbde5109062d9ecdfdf8d51f012cf17b0eb0c89932efc0b4daeb90116903b20c725001f8a8a771cbd2be6a
+MISC ChangeLog 3031 SHA256 a13407197a608dae6e02f906329e976fb3c5f2bc9ef6db846091c909e52b58e8 SHA512 8da39ea5d0f137176ca1706a210d2e449b94d063bad8ec644ac2712b50cf3ba6d6ebf2df09fd05e1b124bc43556a988f2fd5f1d2dcc60ab490d9c8dff863383d WHIRLPOOL 3d1838b7ec5505233349f54236a6e0e7c48ddee3a09766799a9bd63ab2e232bc6fb5a5714d953a4793a8b6feeb16b0fe1c12ddd0bbbf1e173c20d12165759244
 MISC metadata.xml 233 SHA256 c18c10673db4d5aa888d78c564c89bbc64a22caa4242f6e23cf1516e195fab1e SHA512 c9a702ea9051a91d8063d3cebd0145efaf95d17b8c5acbb404b0c1d91137f78a0288a5fc4b27be38abfda97007d1ee48d47379709937ee91dcbf85a0a4cc5858 WHIRLPOOL d8a3a05a61a21bab38615359e378d898855176f9a321c58c91d46b7d87929346edf217f9b27650c6577f40359d472791aad96d9674d712f5fcdf7c065a9c6555
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlAECNcACgkQmWq1bYTyC0N35QD7B3HVG9380n1VTHrnhycYQcy8
+jH4hIIcPi0DlrtKzmNwA/RpY0I+yVafMmfIWHT4eKo8NNd2ovdPN85lLi8pLee4w
+=+sas
+-----END PGP SIGNATURE-----
diff --git a/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch b/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch
index d0039dd98e33..c84cc4d5f17d 100644
--- a/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch
+++ b/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch
@@ -1,22 +1,23 @@
-diff -u -r a/compile.sh b/compile.sh
---- a/compile.sh	2004-08-22 19:37:29.000000000 +0200
-+++ b/compile.sh	2009-02-09 18:13:54.342137472 +0100
-@@ -26,15 +26,15 @@
+diff --git a/compile.sh b/compile.sh
+index fcd6583..2480364 100755
+--- a/compile.sh
++++ b/compile.sh
+@@ -26,15 +26,15 @@ ARGS2=$($SDL_CONFIG --cflags);
  if uname -s | grep -i -c "LINUX" > /dev/null; then 
      echo "GNU/Linux detected.";
      echo "compiling...";    
 -    gcc $ARGS1 $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c;
-+    gcc $ARGS1 $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
++    gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
  elif uname -s | grep -i -c "BEOS" > /dev/null; then 
      echo "BeOS detected.";
      echo "compiling...";
 -    gcc $ARGS1 $ARGS2 -I/boot/develop/tools/gnupro/include/ -I/boot/develop/headers/be/opengl/ -L/boot/home/config/lib -L/boot/develop/tools/gnupro/lib/ -lSDL_image -lGL -lglut -lsmpeg -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c;
-+    gcc $ARGS1 $ARGS2 -I/boot/develop/tools/gnupro/include/ -I/boot/develop/headers/be/opengl/ -L/boot/home/config/lib -L/boot/develop/tools/gnupro/lib/ -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c -lSDL_image -lGL -lglut -lsmpeg;
++    gcc $ARGS2 -I/boot/develop/tools/gnupro/include/ -I/boot/develop/headers/be/opengl/ -L/boot/home/config/lib -L/boot/develop/tools/gnupro/lib/ -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lglut -lsmpeg;
  elif uname -s | grep -i -c "BSD" > /dev/null; then 
      echo "BSD detected.";
      echo "compiling...";
 -    gcc $ARGS1 $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c;
-+    gcc $ARGS1 $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
++    gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
  else
      echo "Unknown OS. If you are running Linux, BeOS or";
      echo "FreeBSD please send me the output of 'uname -s'." 
diff --git a/app-misc/tdfsb/files/tdfsb-0.0.10-debugging.patch b/app-misc/tdfsb/files/tdfsb-0.0.10-debugging.patch
new file mode 100644
index 000000000000..e7f24d89ebf4
--- /dev/null
+++ b/app-misc/tdfsb/files/tdfsb-0.0.10-debugging.patch
@@ -0,0 +1,28 @@
+diff --git a/compile.sh b/compile.sh
+index 2480364..96e9bd2 100755
+--- a/compile.sh
++++ b/compile.sh
+@@ -23,18 +23,20 @@ echo "Using $SDL_CONFIG.";
+ ARGS1=$($SDL_CONFIG --libs);
+ ARGS2=$($SDL_CONFIG --cflags);
+ 
++set -x
++
+ if uname -s | grep -i -c "LINUX" > /dev/null; then 
+     echo "GNU/Linux detected.";
+     echo "compiling...";    
+-    gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
++    gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg || exit 1
+ elif uname -s | grep -i -c "BEOS" > /dev/null; then 
+     echo "BeOS detected.";
+     echo "compiling...";
+-    gcc $ARGS2 -I/boot/develop/tools/gnupro/include/ -I/boot/develop/headers/be/opengl/ -L/boot/home/config/lib -L/boot/develop/tools/gnupro/lib/ -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lglut -lsmpeg;
++    gcc $ARGS2 -I/boot/develop/tools/gnupro/include/ -I/boot/develop/headers/be/opengl/ -L/boot/home/config/lib -L/boot/develop/tools/gnupro/lib/ -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lglut -lsmpeg || exit 1
+ elif uname -s | grep -i -c "BSD" > /dev/null; then 
+     echo "BSD detected.";
+     echo "compiling...";
+-    gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
++    gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg || exit 1
+ else
+     echo "Unknown OS. If you are running Linux, BeOS or";
+     echo "FreeBSD please send me the output of 'uname -s'." 
diff --git a/app-misc/tdfsb/tdfsb-0.0.10.ebuild b/app-misc/tdfsb/tdfsb-0.0.10.ebuild
index d4e029b88cb3..0f0a14940e86 100644
--- a/app-misc/tdfsb/tdfsb-0.0.10.ebuild
+++ b/app-misc/tdfsb/tdfsb-0.0.10.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tdfsb/tdfsb-0.0.10.ebuild,v 1.8 2010/09/16 16:31:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tdfsb/tdfsb-0.0.10.ebuild,v 1.9 2012/07/16 12:28:19 angelos Exp $
+
+EAPI=4
 
 inherit eutils toolchain-funcs
 
@@ -18,12 +20,12 @@ DEPEND="media-libs/smpeg
 	media-libs/freeglut"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-asneeded.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-debugging.patch
+
 	sed -i -e "s:-O2:${CFLAGS} ${LDFLAGS}:" \
-		-e "s:gcc:$(tc-getCC):" "${S}"/compile.sh
+		-e "s:gcc:$(tc-getCC):" "${S}"/compile.sh || die
 }
 
 src_compile() {
@@ -31,6 +33,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin tdfsb || die
+	dobin tdfsb
 	dodoc ChangeLog README
 }