From 806179208231ae0c49a4e14136c93b8a618a25f2 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Thu, 18 Mar 2010 21:33:10 +0000 Subject: [PATCH] Remove forced -O3 -fomit-frame-pointer CFLAGS, bug #308145 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-devel/clang/ChangeLog | 8 +++- sys-devel/clang/Manifest | 5 ++- ...lang-2.6-r1.ebuild => clang-2.6-r2.ebuild} | 5 ++- sys-devel/clang/files/llvm-2.6-cflags.patch | 37 +++++++++++++++++++ 4 files changed, 51 insertions(+), 4 deletions(-) rename sys-devel/clang/{clang-2.6-r1.ebuild => clang-2.6-r2.ebuild} (94%) create mode 100644 sys-devel/clang/files/llvm-2.6-cflags.patch diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog index 0cf1710a14d0..188ac7ff4b0d 100644 --- a/sys-devel/clang/ChangeLog +++ b/sys-devel/clang/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/clang # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.9 2010/01/28 00:32:05 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.10 2010/03/18 21:33:10 voyageur Exp $ + +*clang-2.6-r2 (18 Mar 2010) + + 18 Mar 2010; Bernard Cafarelli -clang-2.6-r1.ebuild, + +clang-2.6-r2.ebuild, +files/llvm-2.6-cflags.patch: + Remove forced -O3 -fomit-frame-pointer CFLAGS, bug #308145 28 Jan 2010; Bernard Cafarelli clang-2.6-r1.ebuild: vecho -> echo, spotted by tove diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest index acf74a2981e2..96171ea08cba 100644 --- a/sys-devel/clang/Manifest +++ b/sys-devel/clang/Manifest @@ -1,6 +1,7 @@ AUX clang-2.6-fixdoc.patch 1885 RMD160 40512b1dcbb245c959b77408bcb7c02a590ac7d9 SHA1 67be72160a5733c251bcf9cead453353e0359394 SHA256 b0f5bf5de8af96ea92ee39701feb5131e7c98a21ccf52be53650cce63d1af052 +AUX llvm-2.6-cflags.patch 1177 RMD160 9c9061834d87357930d3ea1ef9f56a355885acb9 SHA1 4472b00a4d22b29e690e69fa0c2a365858634484 SHA256 f666995873ab6fe987229c941efb168de2bf9353115248ae37942a2d30d67182 DIST clang-2.6.tar.gz 3857138 RMD160 b7e44abbf28902ff8e3fd4578a5ff9dd34f40817 SHA1 188f29ad3b2c64fcdc791aa34b323ed06452d7ae SHA256 98e22f4f5877fb3c73abb9ddcb3065ba9c94a21146387da7f905e6fd559d39ea DIST llvm-2.6.tar.gz 7790380 RMD160 24d58cb052ab5879aae59eaf4885ec41186ee22a SHA1 547471147cbf6d3e49539e01196ffada2c79c250 SHA256 4cd9257350c5ff8b9b139d19497e2396c0604eef0e5d6504f5c1463b09bf2d84 -EBUILD clang-2.6-r1.ebuild 3805 RMD160 31ead2ada18e17bb31d3a33439b2785ffa4ca17c SHA1 f5dd8f2e96d2aec7bf1d6aab4d10fa3eb033b1e1 SHA256 bd96774dd9c91a7a16628d7c6db35d196c6ca3e69504738409e866b189025ae9 -MISC ChangeLog 1581 RMD160 2fe7a22f353ebc71611daf8e8ef49ad23b5888d4 SHA1 31fad4a73f2e9e72ad08b5fbb4450cfff3f1fcb1 SHA256 1fd012268b1fbf980bbb9b0d3b5f0551f1502a4be37ba476d87dd7bb5ecba1cb +EBUILD clang-2.6-r2.ebuild 3918 RMD160 f30347c7512806c87fc64abd6e67a429d083d8d8 SHA1 25db8c502f95726c4544c22ff2ed4c498fdf834d SHA256 02d59e2da34283b08ef03d9d56fcdb4f916d42cf367b49e8067e356615de4c98 +MISC ChangeLog 1804 RMD160 af27ff495d6755e244c790a9f52f504157c8d9c0 SHA1 7a72da2090e94cd5e227dfa2c11cf709ebab6ef5 SHA256 1039a5b97cd792076bb0744cf0cb7536f505f53a8d83771d0f65c81e3a41eaf2 MISC metadata.xml 1098 RMD160 472ed702bea452e68447b59908bc9279bbb890dd SHA1 ef26faea642b17778814391ccd3016f933ec8e12 SHA256 2d18687396a420ad6aa7179f1104b90962514d2fcf94e3838ce82cd109b359c0 diff --git a/sys-devel/clang/clang-2.6-r1.ebuild b/sys-devel/clang/clang-2.6-r2.ebuild similarity index 94% rename from sys-devel/clang/clang-2.6-r1.ebuild rename to sys-devel/clang/clang-2.6-r2.ebuild index 33af416d1ab6..1c3ea20c8c36 100644 --- a/sys-devel/clang/clang-2.6-r1.ebuild +++ b/sys-devel/clang/clang-2.6-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.6-r1.ebuild,v 1.5 2010/01/28 00:32:05 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.6-r2.ebuild,v 1.1 2010/03/18 21:33:10 voyageur Exp $ EAPI=2 inherit eutils python @@ -53,6 +53,9 @@ src_prepare() { einfo "Fixing rpath" sed -e 's/\$(RPATH) -Wl,\$(\(ToolDir\|LibDir\))//g' -i Makefile.rules \ || die "rpath sed failed" + + # Do not force -O3 -fomit-frame-pointer on users, from llvm ebuild + epatch "${FILESDIR}"/llvm-2.6-cflags.patch } src_configure() { diff --git a/sys-devel/clang/files/llvm-2.6-cflags.patch b/sys-devel/clang/files/llvm-2.6-cflags.patch new file mode 100644 index 000000000000..fbc09657917f --- /dev/null +++ b/sys-devel/clang/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 -- 2.26.2