summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-09-22 12:21:49 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-09-22 12:21:49 +0000
commit411b603660ef0d9f90e3acbcde7cd43ee1137a69 (patch)
tree197cdf60c75344caed5771bd4fad34467b61f726 /games-puzzle/xbomb
parentFix building with xfce4-panel >= 4.7. (diff)
downloadgentoo-2-411b603660ef0d9f90e3acbcde7cd43ee1137a69.tar.gz
gentoo-2-411b603660ef0d9f90e3acbcde7cd43ee1137a69.tar.bz2
gentoo-2-411b603660ef0d9f90e3acbcde7cd43ee1137a69.zip
Respect LDFLAGS. Bug #337872
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'games-puzzle/xbomb')
-rw-r--r--games-puzzle/xbomb/ChangeLog6
-rw-r--r--games-puzzle/xbomb/files/xbomb-2.2a-ldflags.patch11
-rw-r--r--games-puzzle/xbomb/xbomb-2.2a.ebuild5
3 files changed, 19 insertions, 3 deletions
diff --git a/games-puzzle/xbomb/ChangeLog b/games-puzzle/xbomb/ChangeLog
index 925e3d77607e..a4b711e027f5 100644
--- a/games-puzzle/xbomb/ChangeLog
+++ b/games-puzzle/xbomb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-puzzle/xbomb
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xbomb/ChangeLog,v 1.21 2010/01/23 15:40:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xbomb/ChangeLog,v 1.22 2010/09/22 12:21:49 tupone Exp $
+
+ 22 Sep 2010; Alfredo Tupone <tupone@gentoo.org> xbomb-2.2a.ebuild,
+ +files/xbomb-2.2a-ldflags.patch:
+ Respect LDFLAGS. Bug #337872 by flameeyes@gentoo.org
23 Jan 2010; Brent Baude <ranger@gentoo.org> xbomb-2.2a.ebuild:
stable ppc, bug 299037
diff --git a/games-puzzle/xbomb/files/xbomb-2.2a-ldflags.patch b/games-puzzle/xbomb/files/xbomb-2.2a-ldflags.patch
new file mode 100644
index 000000000000..b1a18784fa43
--- /dev/null
+++ b/games-puzzle/xbomb/files/xbomb-2.2a-ldflags.patch
@@ -0,0 +1,11 @@
+--- Makefile.old 2010-09-22 14:18:37.000000000 +0200
++++ Makefile 2010-09-22 14:19:06.000000000 +0200
+@@ -30,7 +30,7 @@
+ ########
+
+ xbomb : $(OBJ)
+- $(LINK) $(OBJ) -o $@ $(LIB) $(XLIB)
++ $(LINK) $(LDFLAGS) $(OBJ) -o $@ $(LIB) $(XLIB)
+
+ ########
+
diff --git a/games-puzzle/xbomb/xbomb-2.2a.ebuild b/games-puzzle/xbomb/xbomb-2.2a.ebuild
index 6b3d919fd487..17fa6d2d8315 100644
--- a/games-puzzle/xbomb/xbomb-2.2a.ebuild
+++ b/games-puzzle/xbomb/xbomb-2.2a.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xbomb/xbomb-2.2a.ebuild,v 1.5 2010/01/23 15:40:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xbomb/xbomb-2.2a.ebuild,v 1.6 2010/09/22 12:21:49 tupone Exp $
EAPI=2
inherit eutils games
@@ -17,7 +17,8 @@ IUSE=""
DEPEND="x11-libs/libXaw"
src_prepare() {
- epatch "${FILESDIR}"/${P}-DESTDIR.patch
+ epatch "${FILESDIR}"/${P}-DESTDIR.patch \
+ "${FILESDIR}"/${P}-ldflags.patch
sed -i \
-e '/strip/d' \
-e "/^CFLAGS/ { s:=.*:=${CFLAGS}: }" \