diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2009-02-09 17:16:58 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2009-02-09 17:16:58 +0000 |
| commit | 3b4fc60b5c4c49bd8260e79d1cd0f5eeaa9c6281 (patch) | |
| tree | 1fc35e9053c158ce7b534c3fbbbe2eb40e4bec87 /app-misc/tdfsb | |
| parent | Use the correct CC and don't gzip man by default. (diff) | |
| download | gentoo-2-3b4fc60b5c4c49bd8260e79d1cd0f5eeaa9c6281.tar.gz gentoo-2-3b4fc60b5c4c49bd8260e79d1cd0f5eeaa9c6281.tar.bz2 gentoo-2-3b4fc60b5c4c49bd8260e79d1cd0f5eeaa9c6281.zip | |
Fix compilation with --as-needed, respect CC and LDFLAGS
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/tdfsb')
| -rw-r--r-- | app-misc/tdfsb/ChangeLog | 8 | ||||
| -rw-r--r-- | app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch | 22 | ||||
| -rw-r--r-- | app-misc/tdfsb/tdfsb-0.0.10.ebuild | 13 |
3 files changed, 36 insertions, 7 deletions
diff --git a/app-misc/tdfsb/ChangeLog b/app-misc/tdfsb/ChangeLog index 5e5d653ecaa8..0d22947b961d 100644 --- a/app-misc/tdfsb/ChangeLog +++ b/app-misc/tdfsb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/tdfsb -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/tdfsb/ChangeLog,v 1.23 2008/11/15 13:42:37 flameeyes Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/tdfsb/ChangeLog,v 1.24 2009/02/09 17:16:58 angelos Exp $ + + 09 Feb 2009; Christoph Mende <angelos@gentoo.org> + +files/tdfsb-0.0.10-asneeded.patch, tdfsb-0.0.10.ebuild: + Fix compilation with --as-needed, respect CC and LDFLAGS 15 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org> tdfsb-0.0.10.ebuild: Die when compile fails. diff --git a/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch b/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch new file mode 100644 index 000000000000..d0039dd98e33 --- /dev/null +++ b/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch @@ -0,0 +1,22 @@ +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 @@ + 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; + 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; + 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; + 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 ef4a304067ee..0f3ec4e5b2ec 100644 --- a/app-misc/tdfsb/tdfsb-0.0.10.ebuild +++ b/app-misc/tdfsb/tdfsb-0.0.10.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 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.5 2008/11/15 13:42:37 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/tdfsb/tdfsb-0.0.10.ebuild,v 1.6 2009/02/09 17:16:58 angelos Exp $ -IUSE="" +inherit eutils toolchain-funcs DESCRIPTION="SDL based graphical file browser" HOMEPAGE="http://www.determinate.net/webdata/seg/tdfsb.html" @@ -11,6 +11,7 @@ SRC_URI="http://www.determinate.net/webdata/data/${P}.tar.gz" SLOT="0" LICENSE="GPL-2" KEYWORDS="alpha amd64 ppc -sparc x86" +IUSE="" DEPEND="media-libs/smpeg media-libs/sdl-image @@ -18,8 +19,10 @@ DEPEND="media-libs/smpeg src_unpack() { unpack ${A} - - sed -i "s:-O2:${CFLAGS}:" ${S}/compile.sh + cd "${S}" + epatch "${FILESDIR}"/${P}-asneeded.patch + sed -i -e "s:-O2:${CFLAGS} ${LDFLAGS}:" \ + -e "s:gcc:$(tc-getCC):" ${S}/compile.sh } src_compile() { |