enable openmp only, if gcc is built with openmp support, bug #236988

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc5 i686

4 files changed, 27 insertions, 11 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 27996b84bcc5..b44c871efc7a 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.147 2008/09/07 13:34:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.148 2008/09/07 17:36:30 maekke Exp $
+
+  07 Sep 2008; Markus Meier <maekke@gentoo.org> blender-2.47.ebuild,
+  blender-2.47-r1.ebuild:
+  enable openmp only, if gcc is built with openmp support, bug #236988
 
 *blender-2.47-r1 (07 Sep 2008)
 *blender-2.47 (07 Sep 2008)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 9462ffeba09f..36ea66161368 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -24,14 +24,14 @@ EBUILD blender-2.45-r3.ebuild 3630 RMD160 227ddf68702a6da91e53f51696264882e4922e
 EBUILD blender-2.45-r4.ebuild 3615 RMD160 ac1f9b3019b4df0b096bad978c28ab5f548b1185 SHA1 0e035f0a53a24cb3df933baab85b8fbb2799a744 SHA256 6a4ef47a1744e4af6b479d24e10dbf1686cafaebc8bb97734e8d034208a0b5a9
 EBUILD blender-2.46-r1.ebuild 3630 RMD160 f2a4f3bbdfbc0b30f4284694e6ec263b6e7e66c2 SHA1 54c7eabaf40b17820115d615b21742a5b3e2351c SHA256 bc482c0874bbf57dbfb9770a80041401f7a27c53f65a11260c1785c19e762701
 EBUILD blender-2.46.ebuild 3602 RMD160 86e8526c456b78f44bcd8cc05c1df320d76903f0 SHA1 5c1ab9951e4256ce75f47c9623755cd90e52f2e8 SHA256 d36260c6399766db15b38c79a01216be23dd982113a34e3e83927ed6ecfac52a
-EBUILD blender-2.47-r1.ebuild 3656 RMD160 4494a60c6f7a95881f35e535256b1282f82179dc SHA1 739f859578768f3e233a0b2e655b09a79f914742 SHA256 ecc15c65ee4de6f1a64b5e2a366b59fb7b7bbb95f444ebc9aec5b3cc7625e636
-EBUILD blender-2.47.ebuild 3627 RMD160 cc52e10ecabb6edfaf85b5019fa38ad83b9736c3 SHA1 ff1e9201683e25b0cddfbf557420930f3e56dae0 SHA256 7cc728400bfe5a8fabd9589d3249b04ff3eeaa53cf8fb8f99aee085a6008ddb7
-MISC ChangeLog 21728 RMD160 422551624a2cdddb77b094abebf8e54583df8155 SHA1 8488c965c61a1ccf978796cc18bd974025fab448 SHA256 26854b66624e640b61cd6937a81322e3f7115b8cd3b3d3cce70e771631380f51
+EBUILD blender-2.47-r1.ebuild 3882 RMD160 504efa29f80213bfa67fbc313a8575eb5d53ae35 SHA1 0dd51585a964c8ab630a2fa262ecc2e5d2e27959 SHA256 97e9d38209941786ad07164ed038b7994931b33960ab7308c800f57646ef8d47
+EBUILD blender-2.47.ebuild 3853 RMD160 618e648ed951185e6fe505146733d4052c4cb7cf SHA1 b733bf1bf6eeadfd3be1b1ee9a25036e4788fc13 SHA256 0b2b676ee575844459b9a25142dfbbe0260f1061341c26e26d3a538d02a3e4c6
+MISC ChangeLog 21895 RMD160 28fe03752855b9a6cd1a9b60b55d0614327914df SHA1 6719da2d1aa05d03d11731e1fbc6793d2f285a8b SHA256 aced475589978afe8273c2451a1bfac178eb0a63a6aa6ab776476fd04354dff9
 MISC metadata.xml 932 RMD160 04a75d72bbb07b36af1a124a5a7b97b7b886bc43 SHA1 88f8cb959625be9d081650ad4b443c23485fb1b8 SHA256 1378a8cea2988f8b92041115795955a8fbdbcbe623f83a546270876f8a2f013e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjD2LsACgkQkKaRLQcq0GKXMACgnD8JbyMC/YeoXwA9Q4BYHl45
-Ny4An0XkjqbcBSfy7xvMULEoZ6NPUmVb
-=Cv+B
+iEYEARECAAYFAkjEEXEACgkQkKaRLQcq0GLnVACgsGfLIWY/vRahXbAt5bPugg+z
+49sAn0E1y5WJZw7YLq83E1tILv4b2voN
+=TiT8
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.47-r1.ebuild b/media-gfx/blender/blender-2.47-r1.ebuild
index f14b32e65c20..1ab4ac0e4e65 100644
--- a/media-gfx/blender/blender-2.47-r1.ebuild
+++ b/media-gfx/blender/blender-2.47-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.47-r1.ebuild,v 1.1 2008/09/07 13:34:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.47-r1.ebuild,v 1.2 2008/09/07 17:36:30 maekke Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -78,6 +78,13 @@ src_unpack() {
 		BF_PYTHON_LIB="python${PYVER}"
 	EOF
 
+	if use openmp && built_with_use --missing false sys-devel/gcc openmp ; then
+		echo "WITH_BF_OPENMP=1" >> "${S}"/user-config.py
+		elog "enabling openmp"
+	else
+		echo "WITH_BF_OPENMP=0" >> "${S}"/user-config.py
+		elog "disabling openmp"
+	fi
 }
 
 src_compile() {
@@ -87,7 +94,6 @@ src_compile() {
 			'nls international' \
 			'openal' \
 			'openexr' \
-			'openmp' \
 			'player' \
 			'verse' ; do
 		blend_with ${arg}
diff --git a/media-gfx/blender/blender-2.47.ebuild b/media-gfx/blender/blender-2.47.ebuild
index 4b053dae88be..d469749a21cf 100644
--- a/media-gfx/blender/blender-2.47.ebuild
+++ b/media-gfx/blender/blender-2.47.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.47.ebuild,v 1.1 2008/09/07 13:34:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.47.ebuild,v 1.2 2008/09/07 17:36:30 maekke Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -78,6 +78,13 @@ src_unpack() {
 		BF_PYTHON_LIB="python${PYVER}"
 	EOF
 
+	if use openmp && built_with_use --missing false sys-devel/gcc openmp ; then
+		echo "WITH_BF_OPENMP=1" >> "${S}"/user-config.py
+		elog "enabling openmp"
+	else
+		echo "WITH_BF_OPENMP=0" >> "${S}"/user-config.py
+		elog "disabling openmp"
+	fi
 }
 
 src_compile() {
@@ -87,7 +94,6 @@ src_compile() {
 			'nls international' \
 			'openal' \
 			'openexr' \
-			'openmp' \
 			'player' \
 			'verse' ; do
 		blend_with ${arg}