summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2012-07-16 12:28:19 +0000
committerChristoph Mende <angelos@gentoo.org>2012-07-16 12:28:19 +0000
commit6a39de9917c2a1ed4b10b6ca5ac784d2d73dcd74 (patch)
treeddf7c0e9c0475b2a3b733c1a64fae59ddaeef598 /app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch
parentStable ppc ppc64, bug #420853 (diff)
downloadgentoo-2-6a39de9917c2a1ed4b10b6ca5ac784d2d73dcd74.tar.gz
gentoo-2-6a39de9917c2a1ed4b10b6ca5ac784d2d73dcd74.tar.bz2
gentoo-2-6a39de9917c2a1ed4b10b6ca5ac784d2d73dcd74.zip
Fix compilation with --as-needed (bug #424067), properly fail on build errors and output build commands
(Portage version: 2.2.0_alpha118/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch')
-rw-r--r--app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch15
1 files changed, 8 insertions, 7 deletions
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'."