summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2012-10-22 12:43:40 +0000
committerAlfredo Tupone <tupone@gentoo.org>2012-10-22 12:43:40 +0000
commit0008796f2aba9804e526a76d1c817e71a05af6bf (patch)
treed41de9f8c10bfe0c909490047ab341bc3f41112c /games-action
parentInitial commit (diff)
downloadgentoo-2-0008796f2aba9804e526a76d1c817e71a05af6bf.tar.gz
gentoo-2-0008796f2aba9804e526a76d1c817e71a05af6bf.tar.bz2
gentoo-2-0008796f2aba9804e526a76d1c817e71a05af6bf.zip
Removing mtune from CXXFLAGS. Bug #439064
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'games-action')
-rw-r--r--games-action/bzflag/ChangeLog6
-rw-r--r--games-action/bzflag/bzflag-2.4.2.ebuild16
-rw-r--r--games-action/bzflag/files/bzflag-2.4.2-nocxxflags.patch25
3 files changed, 40 insertions, 7 deletions
diff --git a/games-action/bzflag/ChangeLog b/games-action/bzflag/ChangeLog
index c4e48705b013..de7db120b834 100644
--- a/games-action/bzflag/ChangeLog
+++ b/games-action/bzflag/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-action/bzflag
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/ChangeLog,v 1.59 2012/10/18 19:51:23 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/ChangeLog,v 1.60 2012/10/22 12:43:40 tupone Exp $
+
+ 22 Oct 2012; Alfredo Tupone <tupone@gentoo.org> bzflag-2.4.2.ebuild,
+ +files/bzflag-2.4.2-nocxxflags.patch:
+ Removing mtune from CXXFLAGS. Bug #439064 by Vicente Olivert Riera
18 Oct 2012; Anthony G. Basile <blueness@gentoo.org> bzflag-2.4.2.ebuild:
stable ppc, bug #438546
diff --git a/games-action/bzflag/bzflag-2.4.2.ebuild b/games-action/bzflag/bzflag-2.4.2.ebuild
index 79926521f687..909ced8d5f19 100644
--- a/games-action/bzflag/bzflag-2.4.2.ebuild
+++ b/games-action/bzflag/bzflag-2.4.2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/bzflag-2.4.2.ebuild,v 1.3 2012/10/18 19:51:23 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/bzflag-2.4.2.ebuild,v 1.4 2012/10/22 12:43:40 tupone Exp $
-EAPI=2
-inherit eutils flag-o-matic games
+EAPI=4
+inherit autotools eutils flag-o-matic games
DESCRIPTION="3D tank combat simulator game"
HOMEPAGE="http://www.bzflag.org/"
@@ -36,6 +36,11 @@ DEPEND=">=net-misc/curl-7.15.0
sdl? ( ${UIDEPEND} )
!sdl? ( !dedicated? ( ${UIDEPEND} ) )"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-nocxxflags.patch
+ eautoreconf
+}
+
src_configure() {
local myconf
@@ -47,15 +52,14 @@ src_configure() {
fi
egamesconf \
--disable-ccachetest \
- --disable-dependency-tracking \
--without-regex \
$(use_enable upnp UPnP) \
${myconf}
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS TODO ChangeLog BUGS PORTING DEVINFO NEWS README*
+ default
+ dodoc PORTING DEVINFO
if use sdl || ! use dedicated ; then
newicon "data/bzflag-48x48.png" ${PN}.png
diff --git a/games-action/bzflag/files/bzflag-2.4.2-nocxxflags.patch b/games-action/bzflag/files/bzflag-2.4.2-nocxxflags.patch
new file mode 100644
index 000000000000..aab1aba77e4b
--- /dev/null
+++ b/games-action/bzflag/files/bzflag-2.4.2-nocxxflags.patch
@@ -0,0 +1,25 @@
+--- configure.ac.old 2012-10-22 13:58:27.000000000 +0200
++++ configure.ac 2012-10-22 14:01:37.000000000 +0200
+@@ -689,13 +689,9 @@
+ else
+ FLAGS="$FLAGS=$host_cpu"
+ fi
+- CONF_CFLAGS="$CONF_CFLAGS $FLAGS";
+- CONF_CXXFLAGS="$CONF_CXXFLAGS $FLAGS";
+ CONF_CXXFLAGS="$CONF_CXXFLAGS -fsigned-char";;
+ ppc)
+ FLAGS="-mcpu=$host_cpu"
+- CONF_CFLAGS="$CONF_CFLAGS $FLAGS";
+- CONF_CXXFLAGS="$CONF_CXXFLAGS $FLAGS";;
+ esac;;
+ cygwin)
+ AC_DEFINE(HALF_RATE_AUDIO, 1, [Half rate Audio])
+@@ -755,8 +751,6 @@
+ else
+ if test "$GCC" = yes ; then
+ OPTIMIZE="-fexpensive-optimizations"
+- CONF_CFLAGS="$CONF_CFLAGS $OPTIMIZE"
+- CONF_CXXFLAGS="$CONF_CXXFLAGS $OPTIMIZE"
+ fi
+ AC_DEFINE(NDEBUG, 1, [Debugging disabled])
+ fi