Remove forced -O3 -fomit-frame-pointer CFLAGS, bug #308145

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 53 insertions, 6 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 030520260cd6..62942723be9a 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/llvm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.8 2009/11/17 10:14:09 voyageur Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.9 2010/03/18 19:38:22 voyageur Exp $
+
+*llvm-2.6-r1 (18 Mar 2010)
+
+  18 Mar 2010; Bernard Cafarelli <voyageur@gentoo.org> -llvm-2.6.ebuild,
+  +llvm-2.6-r1.ebuild, +files/llvm-2.6-cflags.patch:
+  Remove forced -O3 -fomit-frame-pointer CFLAGS, bug #308145
 
   17 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org> llvm-2.6.ebuild:
   Drop llvm-gcc depend, as it triggers circular dependency on first install
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index a923128b6b42..3ac1fa475af6 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,6 +1,7 @@
+AUX llvm-2.6-cflags.patch 1177 RMD160 9c9061834d87357930d3ea1ef9f56a355885acb9 SHA1 4472b00a4d22b29e690e69fa0c2a365858634484 SHA256 f666995873ab6fe987229c941efb168de2bf9353115248ae37942a2d30d67182
 AUX llvm-2.6-commandguide-nops.patch 975 RMD160 1178c27a8845c2c86d6d381ba3d95b4b9b627f1e SHA1 41b9d8c3ae0ed1023ec72bf629c53fa8981e0264 SHA256 0e36fb43e020fa380230a8c6f2a79b9a19e12e857e833ef856e2b41aaa283649
 AUX llvm-2.6-nodoctargz.patch 1602 RMD160 b4de7f5e68386bd9dab44a6d7addae0eb9d7f958 SHA1 5a2faf5d9c52f1eb1f1eac3aa69b6d0499c093a4 SHA256 503d31616ca7c76f6da1cd46d6e7c54241effbd11652ab568759350f0c21e473
 DIST llvm-2.6.tar.gz 7790380 RMD160 24d58cb052ab5879aae59eaf4885ec41186ee22a SHA1 547471147cbf6d3e49539e01196ffada2c79c250 SHA256 4cd9257350c5ff8b9b139d19497e2396c0604eef0e5d6504f5c1463b09bf2d84
-EBUILD llvm-2.6.ebuild 5114 RMD160 25aa610403383c986ab59637894f34d878cd95ab SHA1 4fc1ca2d1d974d843b6b25263d0fc0ad50f8b82a SHA256 02b19e33b3aa5a0d85ec0926f4bf43be3806f73f4177e12ceb78413ada658e2e
-MISC ChangeLog 1614 RMD160 06ef13451d2fcb735048e7595ee944b866eab23f SHA1 20b97528740c74f080a6fa9056ae30867ccef48c SHA256 18a0ea9dc01a781140840ee0d8244c9f80b7b215fe095b5ff8983b327ce96ea3
+EBUILD llvm-2.6-r1.ebuild 5213 RMD160 ae3d0e9a544cc7432b79a5901de306b28b02c00d SHA1 890a614e13fe8c4343fa2e041f79ca9bf1e3b6fb SHA256 ae82cba7a32104537097644ce330e89d7725a01abe2e11b135af338044ad7b62
+MISC ChangeLog 1830 RMD160 7b5d257662dfbe2b4471f1502505e82906857d4e SHA1 43e4619af410aab0123513ac63433e14722e2233 SHA256 784dd6180fa75a5c69f61bb0ce1eefe18bf904f494bc5523cfde029edbd9171d
 MISC metadata.xml 2288 RMD160 af9be4ed48671eb880b16f7be6fd0f4cce20e05e SHA1 c5c0bcb6379a43f938fa9746acac91de66021af1 SHA256 7ee8a761be956332d626157b4eda36fd907ecb82609c4dbbbe5ce0a26632ece2
diff --git a/sys-devel/llvm/files/llvm-2.6-cflags.patch b/sys-devel/llvm/files/llvm-2.6-cflags.patch
new file mode 100644
index 000000000000..fbc09657917f
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-2.6-cflags.patch
@@ -0,0 +1,37 @@
+--- Makefile.rules.orig	2010-03-18 18:12:25.000000000 +0100
++++ Makefile.rules	2010-03-18 18:15:56.000000000 +0100
+@@ -284,24 +284,9 @@
+ #--------------------------------------------------------------------
+ 
+ CPP.Defines :=
+-# OPTIMIZE_OPTION - The optimization level option we want to build LLVM with
+-# this can be overridden on the make command line.
+-ifndef OPTIMIZE_OPTION
+-  ifneq ($(HOST_OS),MingW)
+-    OPTIMIZE_OPTION := -O3
+-  else
+-    OPTIMIZE_OPTION := -O2
+-  endif
+-endif
+ 
+ ifeq ($(ENABLE_OPTIMIZED),1)
+   BuildMode := Release
+-  # Don't use -fomit-frame-pointer on Darwin or FreeBSD.
+-  ifneq ($(HOST_OS),FreeBSD)
+-  ifneq ($(HOST_OS),Darwin)
+-    OmitFramePointer := -fomit-frame-pointer
+-  endif
+-  endif
+ 
+   # Darwin requires -fstrict-aliasing to be explicitly enabled.
+   # Avoid -fstrict-aliasing on Darwin for now, there are unresolved issues
+@@ -309,9 +294,6 @@
+   #ifeq ($(HOST_OS),Darwin)
+   #  EXTRA_OPTIONS += -fstrict-aliasing -Wstrict-aliasing
+   #endif
+-  CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
+-  C.Flags   += $(OPTIMIZE_OPTION) $(OmitFramePointer)
+-  LD.Flags  += $(OPTIMIZE_OPTION)
+ else
+   BuildMode := Debug
+   CXX.Flags += -g
diff --git a/sys-devel/llvm/llvm-2.6.ebuild b/sys-devel/llvm/llvm-2.6-r1.ebuild
index 173fb697d9f8..51a54ed9e3e6 100644
--- a/sys-devel/llvm/llvm-2.6.ebuild
+++ b/sys-devel/llvm/llvm-2.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.6.ebuild,v 1.4 2009/11/17 10:14:09 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.6-r1.ebuild,v 1.1 2010/03/18 19:38:22 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs
@@ -89,6 +89,9 @@ src_prepare() {
 
 	# Buggy test, http://llvm.org/bugs/show_bug.cgi?id=5047
 	rm test/DebugInfo/2009-01-15-dbg_declare.ll
+
+	# Do not force -O3 -fomit-frame-pointer on users
+	epatch "${FILESDIR}"/${PN}-2.6-cflags.patch
 }
 
 src_configure() {