diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-09-30 22:09:19 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-09-30 22:09:19 +0000 |
| commit | dbe98c45cf103b14be47a2a3ace80e7e94120462 (patch) | |
| tree | 162bbd5da32e81c74f5a26371a30b7bba2c07d25 /games-action | |
| parent | Respect LDFLAGS. Bug #337432 (diff) | |
| download | gentoo-2-dbe98c45cf103b14be47a2a3ace80e7e94120462.tar.gz gentoo-2-dbe98c45cf103b14be47a2a3ace80e7e94120462.tar.bz2 gentoo-2-dbe98c45cf103b14be47a2a3ace80e7e94120462.zip | |
Respect LDFLAGS. Bug #337424
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'games-action')
| -rw-r--r-- | games-action/poopmup/ChangeLog | 6 | ||||
| -rw-r--r-- | games-action/poopmup/files/poopmup-1.2-ldflags.patch | 11 | ||||
| -rw-r--r-- | games-action/poopmup/poopmup-1.2.ebuild | 10 |
3 files changed, 21 insertions, 6 deletions
diff --git a/games-action/poopmup/ChangeLog b/games-action/poopmup/ChangeLog index 79af7d4e8e64..166d1584c694 100644 --- a/games-action/poopmup/ChangeLog +++ b/games-action/poopmup/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-action/poopmup # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/ChangeLog,v 1.14 2010/09/16 16:48:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/ChangeLog,v 1.15 2010/09/30 22:09:19 tupone Exp $ + + 30 Sep 2010; Tupone Alfredo <tupone@gentoo.org> poopmup-1.2.ebuild, + +files/poopmup-1.2-ldflags.patch: + Respect LDFLAGS. Bug #337424 by flameeyes@gentoo.org 16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> poopmup-1.2.ebuild: virtual/glut -> media-libs/glut diff --git a/games-action/poopmup/files/poopmup-1.2-ldflags.patch b/games-action/poopmup/files/poopmup-1.2-ldflags.patch new file mode 100644 index 000000000000..e831a4fc34dd --- /dev/null +++ b/games-action/poopmup/files/poopmup-1.2-ldflags.patch @@ -0,0 +1,11 @@ +--- Makefile.old 2010-10-01 00:05:06.000000000 +0200 ++++ Makefile 2010-10-01 00:05:30.000000000 +0200 +@@ -7,7 +7,7 @@ + OBJ =poopmup.o
+
+ all:
+- $(CC) $(SOURCE) -o $(OBJ) -lglut -lGL -lGLU -L/usr/X11R6/lib -lXmu -lXext -lXt -lXi -lX11
++ $(CC) $(LDFLAGS) $(SOURCE) -o $(OBJ) -lglut -lGL -lGLU -L/usr/X11R6/lib -lXmu -lXext -lXt -lXi -lX11
+
+
+ clean:
diff --git a/games-action/poopmup/poopmup-1.2.ebuild b/games-action/poopmup/poopmup-1.2.ebuild index d587be9d25c3..6fbd083084bc 100644 --- a/games-action/poopmup/poopmup-1.2.ebuild +++ b/games-action/poopmup/poopmup-1.2.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/poopmup-1.2.ebuild,v 1.17 2010/09/16 16:48:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/poopmup-1.2.ebuild,v 1.18 2010/09/30 22:09:19 tupone Exp $ +EAPI="2" inherit eutils toolchain-funcs games @@ -21,9 +22,7 @@ DEPEND="media-libs/freeglut S=${WORKDIR}/${PN} -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { sed -i \ -e "s:textures/:${GAMES_DATADIR}/${PN}/:" \ includes/textureLoader.h || die "sed failed" @@ -36,7 +35,8 @@ src_unpack() { epatch \ "${FILESDIR}"/${P}-freeglut.patch \ - "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-ldflags.patch ecvs_clean } |