diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2010-03-18 19:38:24 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2010-03-18 19:38:24 +0000 |
| commit | 5a9fe94ccef08aadd6e431ac8fe7ee1221ab11a2 (patch) | |
| tree | 055a43677de498736f6b7daac4d248813ac1b1bc | |
| parent | add missing ChangeLog from last commit (diff) | |
| download | gentoo-2-5a9fe94ccef08aadd6e431ac8fe7ee1221ab11a2.tar.gz gentoo-2-5a9fe94ccef08aadd6e431ac8fe7ee1221ab11a2.tar.bz2 gentoo-2-5a9fe94ccef08aadd6e431ac8fe7ee1221ab11a2.zip | |
Remove forced -O3 -fomit-frame-pointer CFLAGS, bug #308145
(Portage version: 2.2_rc67/cvs/Linux x86_64)
| -rw-r--r-- | sys-devel/llvm/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-devel/llvm/files/llvm-2.6-cflags.patch | 37 | ||||
| -rw-r--r-- | sys-devel/llvm/llvm-2.6-r1.ebuild (renamed from sys-devel/llvm/llvm-2.6.ebuild) | 7 |
3 files changed, 50 insertions, 4 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/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() { |