Fix forced -O3 -fomit-frame-pointer CFLAGS again, bug #385543

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

5 files changed, 32 insertions, 38 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index 00056a2af03c..1957ed46c3b4 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.42 2011/10/03 13:36:31 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.43 2011/10/04 11:52:07 voyageur Exp $
+
+  04 Oct 2011; Bernard Cafarelli <voyageur@gentoo.org> clang-2.8-r3.ebuild,
+  clang-2.9-r1.ebuild, clang-9999.ebuild:
+  Fix forced -O3 -fomit-frame-pointer CFLAGS again, bug #385543
 
   03 Oct 2011; Bernard Cafarelli <voyageur@gentoo.org> clang-2.8-r3.ebuild,
   -clang-2.9.ebuild, clang-2.9-r1.ebuild, clang-9999.ebuild, metadata.xml:
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index c45cde442d64..b04a920aae75 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -11,15 +11,15 @@ DIST clang-2.8.tgz 5666777 RMD160 f00956b6de29cc09f3992aeabd140f2189c6cf39 SHA1
 DIST clang-2.9.tgz 6243772 RMD160 4ab79cbd0e2ad25a2272e6ee2fbbf546818dbd73 SHA1 5fd3b5cec050ec12858c1602b23cf096282ad4a4 SHA256 70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df
 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
 DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
-EBUILD clang-2.8-r3.ebuild 6705 RMD160 c352eef7ad232366103c5f95aa8824cde5b463df SHA1 e9008981b715af9a3ecb6352dbff5728f591b91d SHA256 386a60cc32060cdc99e96033bddc78395a5e8e8c925089fbeebfca421521e788
-EBUILD clang-2.9-r1.ebuild 6607 RMD160 c4c6f5c98be7411a0998f4720e85116a4c03f3c1 SHA1 5a8072f9372be7ec51429d3b7be05209774611ed SHA256 0d8e72cd348d67c64ad1f3eb5801753619342df1a1ca026382efb5e60942a38e
-EBUILD clang-9999.ebuild 6173 RMD160 ebb051b2593a68c44bf91d5aa0aa173cfbab07f1 SHA1 538c89e0ffd93c766543dcd5a365e0b278b0ab2c SHA256 35b806177a22d18d6570fcbadab6fb5543b5d8d66bc418ee1c62ea14caeb52e5
-MISC ChangeLog 7754 RMD160 48ce4e1722787407960ef64e6ddd19da2ff8314b SHA1 2be9d044de6c622525491807dc023adcbee200f9 SHA256 4fcfa684478c2b7b99977a579c4b6eb10c95cbbfe0606a6ab6f75267cbc04d5a
+EBUILD clang-2.8-r3.ebuild 6797 RMD160 ecb174c3026addd2435661bdcca680d27c8f0ccc SHA1 068109d69dc0abc43d3ec57c010028cf273cd0ff SHA256 e1039d4fce36749d5c1aee7e1a95ebcc9a45f1ca2ace4070fd33eac32ae52382
+EBUILD clang-2.9-r1.ebuild 6460 RMD160 56389cfa3a9d277c63a0cbf4e96781d331fa30f3 SHA1 8250c053ee1f802d8dc7cba02f9d6139910767bf SHA256 2891bc50c715d38060a5ea4bff21a83ccc90fa335490831adb264fd2308c55a7
+EBUILD clang-9999.ebuild 6026 RMD160 15a3c0d016e444104f961de16060b61b8a18c70c SHA1 1e5f0dcbd70de67827e550ec2d96b2137ee6b9c4 SHA256 d066e78102dc0e060a473c0caea0c4f18cbadc395f68d21196972a5cad363c3d
+MISC ChangeLog 7937 RMD160 9d068feddaee2bb5032ad2c415155e777655b32e SHA1 f69591e8497f66b0867c57e24db646f701d4d6e3 SHA256 d4ff82083d306e8044e1ddf85db01d9b7fab157c0ee3b38741789aac91a51faf
 MISC metadata.xml 1339 RMD160 5f8b76cda96fc95f67fd8ff7f977c116a4f0f28a SHA1 034f922ae098216b179e9d5c78246f9caa95b9d6 SHA256 0ef2f9bcc4f3293dcb69b2c882b93737b9be496e6f8789efa69df6adb2c1edf8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6JumsACgkQFYEBGcdFJfIxIAD7BRLm6j2JvtFBIMPziqEndtPc
-AYdrzQ8klDp2fGv88RwA/iR+ypnq7FbIekFDk7vKtBSZwbh93LBEzqUkK8HI5yxG
-=+rzZ
+iF4EAREIAAYFAk6K83kACgkQFYEBGcdFJfKScgEAlR+cq3RCOw1kBtaA38a1QTKa
+clbHKNbtDu10YKOCwPcBAJycX0jNQ6D451UFidQwREgUgYTB7bKeXYUGI2eZHHFK
+=3OzY
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/clang/clang-2.8-r3.ebuild b/sys-devel/clang/clang-2.8-r3.ebuild
index 88ba8c8e784f..d624806ed157 100644
--- a/sys-devel/clang/clang-2.8-r3.ebuild
+++ b/sys-devel/clang/clang-2.8-r3.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/sys-devel/clang/clang-2.8-r3.ebuild,v 1.5 2011/10/03 13:36:31 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.8-r3.ebuild,v 1.6 2011/10/04 11:52:07 voyageur Exp $
 
 EAPI=3
 
@@ -67,8 +67,9 @@ src_prepare() {
 		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/llvm, \
 		-i Makefile.config.in || die "Makefile.config sed failed"
 
-	einfo "Fixing rpath"
+	einfo "Fixing rpath and CFLAGS"
 	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/llvm, \
+		-e '/OmitFramePointer/s/-fomit-frame-pointer//' \
 		-i Makefile.rules || die "rpath sed failed"
 }
 
@@ -82,6 +83,7 @@ src_configure() {
 	else
 		CONF_FLAGS="${CONF_FLAGS} \
 			--enable-optimized \
+			--with-optimize-option= \
 			--disable-assertions \
 			--disable-expensive-checks"
 	fi
diff --git a/sys-devel/clang/clang-2.9-r1.ebuild b/sys-devel/clang/clang-2.9-r1.ebuild
index bb830c68d643..20f097524d11 100644
--- a/sys-devel/clang/clang-2.9-r1.ebuild
+++ b/sys-devel/clang/clang-2.9-r1.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/sys-devel/clang/clang-2.9-r1.ebuild,v 1.2 2011/10/03 13:36:31 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.9-r1.ebuild,v 1.3 2011/10/04 11:52:07 voyageur Exp $
 
 EAPI=3
 
@@ -64,24 +64,18 @@ src_prepare() {
 		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/llvm, \
 		-i Makefile.config.in || die "Makefile.config sed failed"
 
-	einfo "Fixing rpath"
+	einfo "Fixing rpath and CFLAGS"
 	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/llvm, \
+		-e '/OmitFramePointer/s/-fomit-frame-pointer//' \
 		-i Makefile.rules || die "rpath sed failed"
 }
 
 src_configure() {
-	local CONF_FLAGS="--enable-shared"
-
-	if use debug; then
-		CONF_FLAGS="${CONF_FLAGS} --disable-optimized"
-		einfo "Note: Compiling LLVM in debug mode will create huge and slow binaries"
-		# ...and you probably shouldn't use tmpfs, unless it can hold 900MB
-	else
-		CONF_FLAGS="${CONF_FLAGS} \
-			--enable-optimized \
-			--disable-assertions \
-			--disable-expensive-checks"
-	fi
+	local CONF_FLAGS="--enable-shared
+		--with-optimize-option=
+		$(use_enable !debug optimized)
+		$(use_enable debug assertions)
+		$(use_enable debug expensive-checks)"
 
 	# Setup the search path to include the Prefix includes
 	if use prefix ; then
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index f163db75862c..052c9831b985 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.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/sys-devel/clang/clang-9999.ebuild,v 1.16 2011/10/03 13:36:31 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.17 2011/10/04 11:52:07 voyageur Exp $
 
 EAPI=3
 
@@ -56,24 +56,18 @@ src_prepare() {
 		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/llvm, \
 		-i Makefile.config.in || die "Makefile.config sed failed"
 
-	einfo "Fixing rpath"
+	einfo "Fixing rpath and CFLAGS"
 	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/llvm, \
+		-e '/OmitFramePointer/s/-fomit-frame-pointer//' \
 		-i Makefile.rules || die "rpath sed failed"
 }
 
 src_configure() {
-	local CONF_FLAGS="--enable-shared"
-
-	if use debug; then
-		CONF_FLAGS="${CONF_FLAGS} --disable-optimized"
-		einfo "Note: Compiling LLVM in debug mode will create huge and slow binaries"
-		# ...and you probably shouldn't use tmpfs, unless it can hold 900MB
-	else
-		CONF_FLAGS="${CONF_FLAGS} \
-			--enable-optimized \
-			--disable-assertions \
-			--disable-expensive-checks"
-	fi
+	local CONF_FLAGS="--enable-shared
+		--with-optimize-option=
+		$(use_enable !debug optimized)
+		$(use_enable debug assertions)
+		$(use_enable debug expensive-checks)"
 
 	# Setup the search path to include the Prefix includes
 	if use prefix ; then