diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2012-11-08 21:04:00 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2012-11-08 21:04:00 +0000 |
| commit | 302f6aa96c1dd32c64e3db1fb8da95a4a944b83b (patch) | |
| tree | 4d55b7a4e3de4d25ff82a33cd0cce705eb4026b5 /games-fps/tremulous | |
| parent | restricting tests due to unworkable paths in test suite, closes Bug #430778 (diff) | |
| download | gentoo-2-302f6aa96c1dd32c64e3db1fb8da95a4a944b83b.tar.gz gentoo-2-302f6aa96c1dd32c64e3db1fb8da95a4a944b83b.tar.bz2 gentoo-2-302f6aa96c1dd32c64e3db1fb8da95a4a944b83b.zip | |
Build with USE=dedicated Bug #397923
(Portage version: 2.1.11.31/cvs/Linux i686, signed Manifest commit with key 0145142D)
Diffstat (limited to 'games-fps/tremulous')
| -rw-r--r-- | games-fps/tremulous/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch | 9 | ||||
| -rw-r--r-- | games-fps/tremulous/tremulous-1.1.0-r4.ebuild | 15 |
3 files changed, 20 insertions, 10 deletions
diff --git a/games-fps/tremulous/ChangeLog b/games-fps/tremulous/ChangeLog index 89c6bce1858c..cbc25fa95a9e 100644 --- a/games-fps/tremulous/ChangeLog +++ b/games-fps/tremulous/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/tremulous # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.23 2012/09/10 15:54:18 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.24 2012/11/08 21:04:00 tupone Exp $ + + 08 Nov 2012; Tupone Alfredo <tupone@gentoo.org> tremulous-1.1.0-r4.ebuild, + files/tremulous-1.1.0-ldflags.patch: + Build with USE=dedicated Bug #397923 by Bjoern Ottervik 10 Sep 2012; Michael Sterrett <mr_bones_@gentoo.org> tremulous-1.1.0-r4.ebuild: diff --git a/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch b/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch index 9d7e57e5db3d..3a3582a9aef4 100644 --- a/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch +++ b/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch @@ -20,3 +20,12 @@ ifneq ($(strip $(LIBSDLMAIN)),) ifneq ($(strip $(LIBSDLMAINSRC)),) +@@ -1153,7 +1153,7 @@ + + $(B)/tremded.$(ARCH)$(BINEXT): $(Q3DOBJ) + @echo "LD $@" +- @$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) ++ @$(CC) -o $@ $(LDFLAGS) $(Q3DOBJ) $(LDLIBS) + + + diff --git a/games-fps/tremulous/tremulous-1.1.0-r4.ebuild b/games-fps/tremulous/tremulous-1.1.0-r4.ebuild index 3c261a4710de..e12d30d9728b 100644 --- a/games-fps/tremulous/tremulous-1.1.0-r4.ebuild +++ b/games-fps/tremulous/tremulous-1.1.0-r4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/tremulous-1.1.0-r4.ebuild,v 1.9 2012/09/10 15:54:18 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/tremulous-1.1.0-r4.ebuild,v 1.10 2012/11/08 21:04:00 tupone Exp $ -EAPI=2 +EAPI=4 inherit eutils toolchain-funcs games @@ -79,23 +79,20 @@ src_compile() { USE_CODEC_VORBIS=$(buildit vorbis) \ USE_OPENAL=$(buildit openal) \ USE_LOCAL_HEADERS=0 \ - OPTIMIZE= \ - || die "emake failed" + OPTIMIZE= } src_install() { insinto "${GAMES_DATADIR}"/${PN} - doins -r ../base || die "doins -r failed" + doins -r ../base dodoc ChangeLog ../manual.pdf if use opengl || ! use dedicated ; then - newgamesbin build/release-linux-*/${PN}-smp.* ${PN} \ - || die "newgamesbin ${PN}" + newgamesbin build/release-linux-*/${PN}-smp.* ${PN} newicon "${WORKDIR}"/tyrant.xpm ${PN}.xpm make_desktop_entry ${PN} Tremulous fi if use dedicated ; then - newgamesbin build/release-linux-*/tremded.* ${PN}-ded \ - || die "newgamesbin ${PN}-ded failed" + newgamesbin build/release-linux-*/tremded.* ${PN}-ded fi prepgamesdirs } |