diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2011-07-20 15:26:53 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2011-07-20 15:26:53 +0000 |
| commit | 68b125c0f324d220d3f93c73d7e61156bdae3427 (patch) | |
| tree | ea6c3290e08f05aa55a49606da0ba1465f6ae6e6 /games-arcade | |
| parent | Bump to new prerelease. Apply fix for bug #374671, upstream #39375. (diff) | |
| download | gentoo-2-68b125c0f324d220d3f93c73d7e61156bdae3427.tar.gz gentoo-2-68b125c0f324d220d3f93c73d7e61156bdae3427.tar.bz2 gentoo-2-68b125c0f324d220d3f93c73d7e61156bdae3427.zip | |
respect compile flags (bug #375739)
(Portage version: 2.1.10.3/cvs/Linux i686)
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/criticalmass/ChangeLog | 6 | ||||
| -rw-r--r-- | games-arcade/criticalmass/criticalmass-1.0.2.ebuild | 5 | ||||
| -rw-r--r-- | games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch | 27 |
3 files changed, 35 insertions, 3 deletions
diff --git a/games-arcade/criticalmass/ChangeLog b/games-arcade/criticalmass/ChangeLog index df379bc681a7..e51b88ba13ec 100644 --- a/games-arcade/criticalmass/ChangeLog +++ b/games-arcade/criticalmass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/criticalmass # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.20 2011/05/06 18:21:27 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.21 2011/07/20 15:26:53 mr_bones_ Exp $ + + 20 Jul 2011; Michael Sterrett <mr_bones_@gentoo.org> + criticalmass-1.0.2.ebuild, +files/criticalmass-1.0.2-cflags.patch: + respect compile flags (bug #375739) 06 May 2011; Michael Sterrett <mr_bones_@gentoo.org> +criticalmass-1.0.2.ebuild, +files/criticalmass-1.0.2-gcc43.patch, diff --git a/games-arcade/criticalmass/criticalmass-1.0.2.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2.ebuild index 63c454c13860..d9d5ea2c5054 100644 --- a/games-arcade/criticalmass/criticalmass-1.0.2.ebuild +++ b/games-arcade/criticalmass/criticalmass-1.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/criticalmass-1.0.2.ebuild,v 1.1 2011/05/06 18:21:27 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/criticalmass-1.0.2.ebuild,v 1.2 2011/07/20 15:26:53 mr_bones_ Exp $ EAPI=2 inherit autotools eutils games @@ -25,7 +25,8 @@ S=${WORKDIR}/CriticalMass-${PV} src_prepare() { epatch "${FILESDIR}"/${P}-gcc43.patch \ "${FILESDIR}"/${P}-system_curl.patch \ - "${FILESDIR}"/${P}-libpng14.patch + "${FILESDIR}"/${P}-libpng14.patch \ + "${FILESDIR}"/${P}-cflags.patch rm -rf curl eautoreconf } diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch new file mode 100644 index 000000000000..8b801e51c2cb --- /dev/null +++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch @@ -0,0 +1,27 @@ +--- configure.in.orig 2011-07-20 11:23:19.849122541 -0400 ++++ configure.in 2011-07-20 11:24:28.169713094 -0400 +@@ -35,9 +35,6 @@ + AM_CONDITIONAL(APPLE,test "x$TARGET" = xAPPLE) + AM_CONDITIONAL(WIN32,test "x$TARGET" = xWIN32) + +-CFLAGS="" +-CXXFLAGS="" +- + if test "x$GCC" = xyes; then + CFLAGS="$CFLAGS -W -Wall" + CXXFLAGS="$CXXFLAGS -W -Wall -fno-exceptions" +@@ -51,14 +48,6 @@ + CXXFLAGS="$CXXFLAGS -g" + fi + +-AC_ARG_ENABLE(optimize, +-[ --enable-optimize=level Enable optimization [default=2]], +- enable_optmize=$enableval, enable_optimize=2) +-if test "x$enable_optimize" != "xno" ; then +- CFLAGS="$CFLAGS -O$enable_optimize" +- CXXFLAGS="$CXXFLAGS -O$enable_optimize" +-fi +- + AC_ARG_ENABLE(dyngl, + [ --enable-dyngl Load GL library dynamically [default=off]], + enable_dyngl=$enableval, enable_dyngl=off) |