diff options
author | 2012-08-08 16:12:57 +0000 | |
---|---|---|
committer | 2012-08-08 16:12:57 +0000 | |
commit | b02df52c8a42c29e661354b2861785c5b3c1195f (patch) | |
tree | c985251b3264eaf8197efd79e3c3656fe4a5af9d /games-board/xscrabble | |
parent | Version bump; remove beta (diff) | |
download | gentoo-2-b02df52c8a42c29e661354b2861785c5b3c1195f.tar.gz gentoo-2-b02df52c8a42c29e661354b2861785c5b3c1195f.tar.bz2 gentoo-2-b02df52c8a42c29e661354b2861785c5b3c1195f.zip |
respect cflags wrt #430390
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'games-board/xscrabble')
-rw-r--r-- | games-board/xscrabble/ChangeLog | 8 | ||||
-rw-r--r-- | games-board/xscrabble/files/xscrabble-2.10-build.patch (renamed from games-board/xscrabble/files/xscrabble-2.10-ldflags.patch) | 8 | ||||
-rw-r--r-- | games-board/xscrabble/xscrabble-2.10-r1.ebuild | 6 |
3 files changed, 14 insertions, 8 deletions
diff --git a/games-board/xscrabble/ChangeLog b/games-board/xscrabble/ChangeLog index 5a7e6d8ad71b..dcad0eafa0a0 100644 --- a/games-board/xscrabble/ChangeLog +++ b/games-board/xscrabble/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-board/xscrabble -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/xscrabble/ChangeLog,v 1.12 2010/10/11 15:34:38 tupone Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-board/xscrabble/ChangeLog,v 1.13 2012/08/08 16:12:57 hasufell Exp $ + + 08 Aug 2012; Julian Ospald <hasufell@gentoo.org> xscrabble-2.10-r1.ebuild, + +files/xscrabble-2.10-build.patch, -files/xscrabble-2.10-ldflags.patch: + respect cflags wrt #430390 11 Oct 2010; Tupone Alfredo <tupone@gentoo.org> xscrabble-2.10-r1.ebuild, +files/xscrabble-2.10-ldflags.patch: diff --git a/games-board/xscrabble/files/xscrabble-2.10-ldflags.patch b/games-board/xscrabble/files/xscrabble-2.10-build.patch index ca7076a8ceca..7d5214c7db34 100644 --- a/games-board/xscrabble/files/xscrabble-2.10-ldflags.patch +++ b/games-board/xscrabble/files/xscrabble-2.10-build.patch @@ -1,11 +1,13 @@ ---- build.old 2010-10-11 17:25:44.000000000 +0200 -+++ build 2010-10-11 17:26:08.000000000 +0200 +respect compiler, ldflags and cflags + +--- build ++++ build @@ -36,7 +36,7 @@ #define RULES_FILE \"$LIBDIR/en/scrabble_rules\" " > src/config.h xmkmf -a - make -+ make LOCAL_LDFLAGS="${LDFLAGS}" ++ make CC="${CC}" CCOPTIONS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}" echo " Now, type './build install' to install programs in $BINDIR " diff --git a/games-board/xscrabble/xscrabble-2.10-r1.ebuild b/games-board/xscrabble/xscrabble-2.10-r1.ebuild index 72262869c7cb..38ffcc0818ec 100644 --- a/games-board/xscrabble/xscrabble-2.10-r1.ebuild +++ b/games-board/xscrabble/xscrabble-2.10-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/xscrabble/xscrabble-2.10-r1.ebuild,v 1.9 2010/10/31 01:54:11 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/xscrabble/xscrabble-2.10-r1.ebuild,v 1.10 2012/08/08 16:12:57 hasufell Exp $ EAPI=2 inherit eutils multilib games @@ -30,7 +30,7 @@ src_unpack() { src_prepare() { epatch "${FILESDIR}"/${P}-path-fixes.patch \ - "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-build.patch sed -i '/install/s/-s //' build || die "sed failed" } |