respect CXXFLAGS wrt #416261

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

6 files changed, 75 insertions, 22 deletions

diff --git a/games-strategy/widelands/ChangeLog b/games-strategy/widelands/ChangeLog
index bdb9bc696d79..b25b8983f3eb 100644
--- a/games-strategy/widelands/ChangeLog
+++ b/games-strategy/widelands/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/widelands
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.41 2012/05/15 11:15:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.42 2012/05/16 14:50:47 hasufell Exp $
+
+  16 May 2012; Julian Ospald <hasufell@gentoo.org> widelands-0.16.ebuild,
+  +files/widelands-0.16-cxxflags.patch, widelands-0.17.ebuild,
+  +files/widelands-0.17-cxxflags.patch:
+  respect CXXFLAGS wrt #416261
 
 *widelands-0.17 (15 May 2012)
 
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 65ad589f55f4..64de92017bed 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,28 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX widelands-0.16-cxxflags.patch 728 RMD160 6cf36298f55084ce33adbb47fac354ebc019e5c3 SHA1 fa572e07d482dcee8d182bcdbf4b80c0316d83ad SHA256 933ca96d6d7ee19a23d2cc64bea2a1817c61a18916485c3a9bbfb28778091222
 AUX widelands-0.16-goldmine.patch 558 RMD160 d900c8626141a56057f02a0b75d0a94064437275 SHA1 ba7c59cf4e317403443d87832260bcf23c3feb73 SHA256 e49bb7f6e31a36c3b6bffe374122161c113a65a945087ffaa979988fda7b6ade
 AUX widelands-0.16-libpng15.patch 2064 RMD160 a8c9e83438f41e015a42f7d02d4b51bb5321bfc8 SHA1 2cf53e5b53de93a6fae9b1ad2173cbb90dcce573 SHA256 1b696a840d4beef6740531c1cafc227798c513b4c8dd7d3a61d3ce6b256e02ff
+AUX widelands-0.17-cxxflags.patch 1733 RMD160 1b369e43f8f5bde4511b7ed0d74448818c41ac2a SHA1 c620b8c8092eb33a15a3dc9ddc06eda124711eb4 SHA256 1ce15258755faf1f348601dd0431b1657a73af348bc5f3ca1a9b22d83d6ad150
 DIST widelands-build16-src.tar.bz2 137808494 RMD160 aa7d14fe0071041227cebf5b5974feb74e7b8c8f SHA1 3e6df06337a4e422236bb0c0bb21068cddb6e274 SHA256 d8db3c15c30314cb220c6d79d93d3d31e7bce2722c93d2c385d643c3c669625d
 DIST widelands-build17-src.tar.bz2 175547379 RMD160 4ea81d21d3b3e02fc22194d1a39e8c08e05aaa44 SHA1 0ac6e1a1e6a5ba8cdd01c3f70e4c391ae9186ff1 SHA256 be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5
-EBUILD widelands-0.16.ebuild 1656 RMD160 b74e275219e70642269434751b098926c20c9f77 SHA1 6f3afed3f66f2623e275754c2b5437118e530a5c SHA256 1d5c8046fa1cc8e3c8f09309e785f45e1ccb68a0327a8fd5e69eabb6986cf9b0
-EBUILD widelands-0.17.ebuild 1651 RMD160 3a4a1ab515943a754f634f98cf71166aba568792 SHA1 a217686b2f1c79abe4a6eeb8b95e24c270e4039e SHA256 9f0c1c9f599cfc14734d7627fe3ffa74040769608b94619aaef464e9e712274c
-MISC ChangeLog 6911 RMD160 71e343b7c7e8ec24df060ffc4c7627c9f462e9cb SHA1 dda6bc2dfe2aab1e077c66aaa5bce7cf3800d0cf SHA256 65b866266f89d959c800f85fdb82b4f0c8bf3b5ab9191a2f199fc4770578af9c
+EBUILD widelands-0.16.ebuild 1692 RMD160 2f80b09e98ba4ab4a8699d2a56b7f7d76138bca8 SHA1 700374c88a0cd40b4bfe63f6722a532d76436557 SHA256 fc9c994852cb2349dd75e9f38dbf90505b0972b6e8b7da2a98b665a977e45b0e
+EBUILD widelands-0.17.ebuild 1693 RMD160 f3f77aebc8cf94dee5bab9f617ad8fdd52a0c52f SHA1 544d953dc590770ec1cc1d9f26301ce8c4e3b49c SHA256 53575b8a7c398c99aaf2b7a945b81e8c12800d50ad85136a6f67fe5e29f56f93
+MISC ChangeLog 7119 RMD160 769d8a9884a95aa1bc42576bc45fdedd5708d3d0 SHA1 51f099852b7775a20e5a8e2ad7a8d3b4dc3ab374 SHA256 73dba6bb1cdc416e18ebdea56b902a244cf66772d99c889ad5235a2af6cb1158
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPsjrtAAoJEOSiRoyO7jvohHsQAI8fgo1U47GJUJeEiRZMHeyk
-SebEFMzfEtg4YTWC4o7xAWi2bBWoI61EPLxArSaoHkKjDjWk194IzsbsBr6DZBH0
-LrC9cnA1OQOl+Td7dWMoitXpVNiMTSeQ9FmqRLNe8b4PoQeVS1XpCaQvVYQ5rqRk
-26W+BC1HAeshJvP/YcGQ1RF/g55AbetiDsNUqSwQ+3UlpSR2vnlosgHAe7s/p8QX
-Fxen/SqzXI64rgNCxquHJuYgFoyA6DzbX4Ew2hV2uCH2IXE7OLpf6Iur9FMXkAvj
-0rlqq2ByCCohjUInvgvyDtcz+/CWDYhmdUf4uvlrEneZE3gw+FtwDInXfG9+BMQX
-Too6WzO3pU/eU9JPVVQ3eQvXfuFYMRy4LZEpbnD0JzynhuAejfK7cRef86fTid1h
-BLvQBvAriiSN1I/qenu9PWNA7JagqIEbUtFA23zqXqzrAkhbfX9Zb/tw9aBmuNTp
-SlBlGMuwFLxVpZ4GnGmyC0DzRWocxVp0/prXs0jkTGph3RGlHoew2QEugEpGmMyE
-91b+6LRT2dSkZU08Fm+TfcTh4KNiXwGnS+avsDKQb2nU02CHe99YoPzka6lStROb
-0RMZN+XvrDlZcSrLUNvA2U+1QWwbrSABTb6DRMkSgJtA1YSGSKEGT4P0Ml90iln8
-ISzYPjHZWaPUonGvUriV
-=90YI
+iQEcBAEBAgAGBQJPs75JAAoJEFpvPKfnPDWzFAkIALSgVbDD1MbvR2fxyCF3doz0
+dSPdou3FxIu+6A/f4SQJExPJGATFv59gTtSpY0shrGLORZqUpbuNZ+nNyWRo0YFN
+o/labTFvLnxlQsctZEEgf0dgwphlO9tlaqcZwykAKDy+wqKH3naYlAOgHA0kDXXd
+ZlRRmvCm7yrPfCCKuVt/9t7+/eJI6IExhnB6nSNgYOR2cD32nHXtp7r6Ac+b80D2
+1Yqxtp5fmenFUYpL8PnDcnUYxSnz48oD0duO5o0JN9qLMF0DJqOqfMvVxATkY+31
+x8mdJFbahcX28ARUXAFgdUzsfJUWPTMZ5x8F1IULsQIW3HOl+X6jRQnB4AvB28Y=
+=7Ugu
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/widelands/files/widelands-0.16-cxxflags.patch b/games-strategy/widelands/files/widelands-0.16-cxxflags.patch
new file mode 100644
index 000000000000..3dfb88fb6fd4
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.16-cxxflags.patch
@@ -0,0 +1,16 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed May 16 12:30:18 UTC 2012
+
+respect CXXFLAGS
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -204,7 +204,7 @@
+ set (CMAKE_CXX_FLAGS_DEBUG "-g -DDEBUG -DNOPARACHUTE${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
+ 
+ # CMAKE defines "-O3 -DNDEBUG", but we better say -O2 (see gcc manual)
+-set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
++set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
+ 
+ #If building with MSVC, then check for 3rdparty libs
+ if (DEFINED MSVC)
diff --git a/games-strategy/widelands/files/widelands-0.17-cxxflags.patch b/games-strategy/widelands/files/widelands-0.17-cxxflags.patch
new file mode 100644
index 000000000000..419d5d78a35b
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.17-cxxflags.patch
@@ -0,0 +1,33 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed May 16 12:06:13 UTC 2012
+
+respect CXXFLAGS
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -209,24 +209,7 @@
+ 
+ # CMAKE only defines "-g", but we need -DDEBUG also, and we need -DNOPARACHUTE (for SDL) in Debug
+ set (CMAKE_CXX_FLAGS_DEBUG "-g -DDEBUG -DNOPARACHUTE${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
+-
+-#This can be removed if no one uses gcc 4.5.1 or 4.5.2 any more
+-IF (${CMAKE_COMPILER_IS_GNUCXX})
+-EXEC_PROGRAM (
+-    ${CMAKE_CXX_COMPILER}
+-    ARGS --version
+-    OUTPUT_VARIABLE WLBUILD_COMPILERVERSION
+-    )
+-    STRING(REGEX REPLACE ".*(4)\\.(5)\\.([0-9]).*" "\\1.\\2.\\3" WLBUILD_COMPILERVERSION_REP ${WLBUILD_COMPILERVERSION})
+-    IF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
+-        message("Detected gcc ${WLBUILD_COMPILERVERSION_REP}")
+-        message("Suffering from gcc bug, disabling -O3")
+-        set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
+-    ELSE (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
+-        #This line is the default and should be preserved.
+-        set (CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
+-    ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
+-ENDIF (${CMAKE_COMPILER_IS_GNUCXX})
++set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG" CACHE STRING "Release compiler flags" FORCE)
+ 
+ #If building with MSVC, then check for 3rdparty libs
+ if (DEFINED MSVC)
diff --git a/games-strategy/widelands/widelands-0.16.ebuild b/games-strategy/widelands/widelands-0.16.ebuild
index 1b107822c7ff..8421078f91d7 100644
--- a/games-strategy/widelands/widelands-0.16.ebuild
+++ b/games-strategy/widelands/widelands-0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.16.ebuild,v 1.7 2011/10/15 15:24:49 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.16.ebuild,v 1.8 2012/05/16 14:50:47 hasufell Exp $
 
 EAPI=3
 inherit versionator cmake-utils games
@@ -38,7 +38,8 @@ src_prepare() {
 	sed -i -e '22i#define OF(x) x' src/io/filesystem/ioapi.h || die
 	epatch \
 		"${FILESDIR}"/${P}-goldmine.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
+		"${FILESDIR}"/${P}-libpng15.patch \
+		"${FILESDIR}"/${P}-cxxflags.patch
 }
 
 src_configure() {
diff --git a/games-strategy/widelands/widelands-0.17.ebuild b/games-strategy/widelands/widelands-0.17.ebuild
index 289f0c8c6ab6..a4164855cdd5 100644
--- a/games-strategy/widelands/widelands-0.17.ebuild
+++ b/games-strategy/widelands/widelands-0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.17.ebuild,v 1.1 2012/05/15 11:15:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.17.ebuild,v 1.2 2012/05/16 14:50:47 hasufell Exp $
 
 EAPI=3
 inherit versionator cmake-utils games
@@ -32,6 +32,8 @@ CMAKE_BUILD_TYPE=Release
 PREFIX=${GAMES_DATADIR}/${PN}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-cxxflags.patch
+
 	sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
 	sed -i -e '74i#define OF(x) x' src/io/filesystem/{un,}zip.h || die
 	sed -i -e '22i#define OF(x) x' src/io/filesystem/ioapi.h || die