diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-10-01 08:04:07 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-10-01 08:04:07 +0000 |
| commit | 454dad42056dd07fe9843535b8c0e4fd1388a8a4 (patch) | |
| tree | 5c0c2e34ec76a20f5258355f48eec37ebe0e150c /games-util | |
| parent | Mask www-client/chromium dev channel release. (diff) | |
| download | historical-454dad42056dd07fe9843535b8c0e4fd1388a8a4.tar.gz historical-454dad42056dd07fe9843535b8c0e4fd1388a8a4.tar.bz2 historical-454dad42056dd07fe9843535b8c0e4fd1388a8a4.zip | |
Respect LDFLAGS. Bug #337273
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'games-util')
| -rw-r--r-- | games-util/glbsp/ChangeLog | 8 | ||||
| -rw-r--r-- | games-util/glbsp/Manifest | 5 | ||||
| -rw-r--r-- | games-util/glbsp/files/glbsp-2.20-ldflags.patch | 22 | ||||
| -rw-r--r-- | games-util/glbsp/glbsp-2.20.ebuild | 11 |
4 files changed, 36 insertions, 10 deletions
diff --git a/games-util/glbsp/ChangeLog b/games-util/glbsp/ChangeLog index 790215392358..fb3755a4aa72 100644 --- a/games-util/glbsp/ChangeLog +++ b/games-util/glbsp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-util/glbsp -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/glbsp/ChangeLog,v 1.9 2009/11/26 20:55:44 maekke Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-util/glbsp/ChangeLog,v 1.10 2010/10/01 08:04:07 tupone Exp $ + + 01 Oct 2010; Tupone Alfredo <tupone@gentoo.org> glbsp-2.20.ebuild, + +files/glbsp-2.20-ldflags.patch: + Respect LDFLAGS. Bug #337273 by flameeyes@gentoo.org 26 Nov 2009; Markus Meier <maekke@gentoo.org> glbsp-2.20.ebuild: x86 stable, bug #294541 diff --git a/games-util/glbsp/Manifest b/games-util/glbsp/Manifest index 883cb087bb50..c61317bf33ee 100644 --- a/games-util/glbsp/Manifest +++ b/games-util/glbsp/Manifest @@ -1,4 +1,5 @@ +AUX glbsp-2.20-ldflags.patch 735 RMD160 f9f5fb9615b7aa6e7b0f868de1835686afa024ad SHA1 19416bcc2d3a5ae6aa2068d7d500401a529eb71f SHA256 17416914195cf79f2b29261c33af5441dcfadcdce2f40639fb873dcb91a81e30 DIST glbsp_src_220.tar.gz 172283 RMD160 519a5bd72e41d7d00900df02b94363181a2438c1 SHA1 2b9f5e6441d9b94eed6cdb384b82537dbed33bbf SHA256 0b68b82962aff8c66c4663a5283fa28ef1287beb303dc0c09325e1cecaa8e4d3 -EBUILD glbsp-2.20.ebuild 1468 RMD160 48d6931ae98704fbd7ccd5ceb4da395bcdcb3895 SHA1 9e0bdd54c20781d088b52464d283f6dc56f0934e SHA256 2c922f91bbd23fb37179afe3c13d1db5d011f2f353552544812717eea8a34b7d -MISC ChangeLog 1291 RMD160 28c8f002ab298fbdff4d449da5dd12ba8cf32fbf SHA1 88bb800e62714ea2a8dc346e7cbc41e74897e86d SHA256 47e351da9a131f6191eaafb88097d6bab2ad6b22f119d7a39f478696b92bb84e +EBUILD glbsp-2.20.ebuild 1488 RMD160 e080b22966af8129d384742b8750e8f3ea0c8af7 SHA1 5bfad9085dd17631109e064b3645ca0fff2490f2 SHA256 30a85b83a8177cca0dab5164f0cabcc77135959ea4b8181c12363d4b4a3d1c26 +MISC ChangeLog 1452 RMD160 1cc18977ff6fcba4bca1957754d7f050e2a4dbc6 SHA1 411aff473af98254367e0255ef557b5e2ddc0839 SHA256 31056a2ee2e4d5997fc85e888614720d8cc8ab4ca31a07d47403deb4015407aa MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-util/glbsp/files/glbsp-2.20-ldflags.patch b/games-util/glbsp/files/glbsp-2.20-ldflags.patch new file mode 100644 index 000000000000..e175cc7b136a --- /dev/null +++ b/games-util/glbsp/files/glbsp-2.20-ldflags.patch @@ -0,0 +1,22 @@ +--- Makefile.old 2010-10-01 09:57:28.000000000 +0200 ++++ Makefile 2010-10-01 09:57:52.000000000 +0200 +@@ -36,7 +36,7 @@ + rm -f $(MAIN)/gb_debug.txt $(SYSDIR)/gb_debug.txt + + $(PROGNAME): $(OBJS) +- $(CC) $(CFLAGS) $(OBJS) -o $(PROGNAME) $(LIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) -o $(PROGNAME) $(LIBS) + + bin: all + strip --strip-unneeded $(PROGNAME) +--- GUI_unx.mak.old 2010-10-01 10:00:08.000000000 +0200 ++++ GUI_unx.mak 2010-10-01 10:00:40.000000000 +0200 +@@ -61,7 +61,7 @@ + rm -f $(PROGNAME) $(SYSDIR)/*.o $(SYSDIR)/core + + $(PROGNAME): $(OBJS) +- $(CXX) $(CFLAGS) $(OBJS) -o $(PROGNAME) $(LDFLAGS) $(LIBS) ++ $(CXX) $(LDFLAGS) $(CFLAGS) $(OBJS) -o $(PROGNAME) $(LDFLAGS) $(LIBS) + + bin: all + strip --strip-unneeded $(PROGNAME) diff --git a/games-util/glbsp/glbsp-2.20.ebuild b/games-util/glbsp/glbsp-2.20.ebuild index 636c42052f78..42390044bced 100644 --- a/games-util/glbsp/glbsp-2.20.ebuild +++ b/games-util/glbsp/glbsp-2.20.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/glbsp/glbsp-2.20.ebuild,v 1.4 2009/11/26 20:55:44 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/glbsp/glbsp-2.20.ebuild,v 1.5 2010/10/01 08:04:07 tupone Exp $ -EAPI=1 +EAPI="2" inherit eutils toolchain-funcs versionator @@ -18,9 +18,7 @@ IUSE="fltk" DEPEND="fltk? ( x11-libs/fltk:1.1 )" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { sed -i \ -e "/^CC=/s:=.*:=$(tc-getCC):" \ -e "/^CXX=/s:=.*:=$(tc-getCXX):" \ @@ -29,6 +27,7 @@ src_unpack() { -e "s:-O2:${CFLAGS}:" \ GUI_unx.mak Plugin_unx.mak Makefile \ || die "sed failed" + epatch "${FILESDIR}"/${P}-ldflags.patch } src_compile() { |