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

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

6 files changed, 24 insertions, 199 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index ed2686fde2ca..b97d4af135be 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.46 2011/10/03 13:36:01 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.47 2011/10/04 11:43:37 voyageur Exp $
+
+  04 Oct 2011; Bernard Cafarelli <voyageur@gentoo.org> llvm-2.8-r2.ebuild,
+  -llvm-2.8-r4.ebuild, llvm-2.9-r2.ebuild, llvm-9999.ebuild:
+  Fix forced -O3 -fomit-frame-pointer CFLAGS again, bug #385543
 
   03 Oct 2011; Bernard Cafarelli <voyageur@gentoo.org> -llvm-2.8-r1.ebuild,
   llvm-2.8-r2.ebuild, llvm-2.8-r4.ebuild, -llvm-2.9-r1.ebuild,
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 62693799218a..9a3d4a3afc7a 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -9,16 +9,15 @@ AUX llvm-2.9-Operator.h-c++0x.patch 2062 RMD160 3f137dc80cac2d77b978a332a731e443
 AUX llvm-2.9-nodoctargz.patch 1569 RMD160 6589aa0a41f47e915ce93fe6dcf68dd601c3bcdc SHA1 19795ec9c34e6ec5539ec6a77944ceb51abdef72 SHA256 62f1b080364d94e528bb34f0063562d16a59395aa7f97277bba88fbd93e00b84
 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 llvm-2.8-r2.ebuild 6064 RMD160 a65cbe7aaf46d226f844430f5a459aad373ee7a2 SHA1 4a0787940fd3328fa620e36f27349b494fa4d327 SHA256 591e06c515b561220d4334aa5d02c51021c9b424082c785888e9459d7f95d5aa
-EBUILD llvm-2.8-r4.ebuild 6132 RMD160 1303d8d19fbf64009e68742cdbdf11b00ccde922 SHA1 92c3e6ca5d976684ba37766cd68b58bbfe0c8265 SHA256 883f5997b8e3e9670cb4a2c70e0066c6b6f679ed6e5cd156c6d7b677e3f31c2b
-EBUILD llvm-2.9-r2.ebuild 6025 RMD160 f6d6e780e92f0882088333197439a88d549a89b6 SHA1 54ab1b2cf0ff3652e0d9922dbb25a1131d43e764 SHA256 c07dcbf874d8605d3588288aeccdd5d435bb7c0f2c5117cee8daad3eecc21c65
-EBUILD llvm-9999.ebuild 5927 RMD160 bb1591ef18b0dd8ee152b6d4633bb925d406dca1 SHA1 fc0800481270503d05995786a7c00a98ebc93c50 SHA256 4e0d098bf2ea23b53f01f7aadb25129bfff70355a4c131ad397c200fd933a68b
-MISC ChangeLog 7618 RMD160 4c803b1d655af81c27148aea28fa05fd94f03dc2 SHA1 cfff3870d71ef1c5e6f2cffffcf83f5d5a50f822 SHA256 ec66d70f8cdc7383498940e5c526e6bb5579477dc8549b65f9ec527a4582e50e
+EBUILD llvm-2.8-r2.ebuild 6156 RMD160 9e76bf90d103993330bcf8701c8ee490117c3ab1 SHA1 f691fe35a6a02da441fd9aa1c52a04a2aff298a9 SHA256 9bc669e88d0a49b5fa7c5ada8da9752cade9876fb03bb16cbad1afebee507d1b
+EBUILD llvm-2.9-r2.ebuild 6114 RMD160 efa267a42dfe1d35c0ea5c9e4a52252491e4a9db SHA1 02591fa875edd371f2a47347aa0d74e1cbaac969 SHA256 98092eca9ecb3327b696d76d31a72f766004ec7501c7c569dda5be82ecb9ff60
+EBUILD llvm-9999.ebuild 6016 RMD160 4976ef4a36d8df3f6e572239e1f72bb76016f994 SHA1 99bd699bf214e7474719da3a48ef86dac0d3dd93 SHA256 c2ac834a217cc3826d6d486b68332c3b1a562496f477f15804802c435af59e17
+MISC ChangeLog 7819 RMD160 7a450a3763661fb8cef6e2f728df2c3fba20eebe SHA1 6179ad1ff54f098d36605da79b205f9870137775 SHA256 4356332d05c5632a4ef096b73b82bbc24e30bd6ef6d05995392d1f290e8ed239
 MISC metadata.xml 2234 RMD160 b14138857d612a9f5568760b1e70b80f344d978c SHA1 53d1e496b0e80e9acc24fd1cb8858e9efc93d7c0 SHA256 83a322d633e38210fe9946ea92902a17142863fe26578bb1b1bad773952b0419
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6JulMACgkQFYEBGcdFJfKlXQD/a3nRc/X8fMmkVWPw/BFVzBGc
-VLQY/A+/tq9oC+iJXCAA/A9uUnp1ioa0M9jn0Sm88ikkEWmmX1nU3dSOAuwI6Ru6
-=eecU
+iF4EAREIAAYFAk6K8XcACgkQFYEBGcdFJfKpIAEAi7hiUPysqysIdctsIML1N1C7
+4DjysZr/5lbEX5n6I+gBAKfeO7YHH8Jn8VnMJxoy4gBfBpMcNug6WTQ90nKV8oT2
+=wn+s
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-2.8-r2.ebuild b/sys-devel/llvm/llvm-2.8-r2.ebuild
index d8c60e42ba86..9a5ee3e983ac 100644
--- a/sys-devel/llvm/llvm-2.8-r2.ebuild
+++ b/sys-devel/llvm/llvm-2.8-r2.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/llvm/llvm-2.8-r2.ebuild,v 1.6 2011/10/03 13:36:01 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.8-r2.ebuild,v 1.7 2011/10/04 11:43:37 voyageur Exp $
 
 EAPI="3"
 inherit eutils multilib toolchain-funcs
@@ -75,8 +75,9 @@ src_prepare() {
 	sed -e 's,$ABS_RUN_DIR/lib,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
 		-i tools/llvm-config/llvm-config.in.in || die "llvm-config sed failed"
 
-	einfo "Fixing rpath"
+	einfo "Fixing rpath and CFLAGS"
 	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
+		-e '/OmitFramePointer/s/-fomit-frame-pointer//' \
 		-i Makefile.rules || die "rpath sed failed"
 
 	epatch "${FILESDIR}"/${PN}-2.7-nodoctargz.patch
@@ -96,6 +97,7 @@ src_configure() {
 	else
 		CONF_FLAGS="${CONF_FLAGS} \
 			--enable-optimized \
+			--with-optimize-option= \
 			--disable-assertions \
 			--disable-expensive-checks"
 	fi
diff --git a/sys-devel/llvm/llvm-2.8-r4.ebuild b/sys-devel/llvm/llvm-2.8-r4.ebuild
deleted file mode 100644
index 21e02dff7c48..000000000000
--- a/sys-devel/llvm/llvm-2.8-r4.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.8-r4.ebuild,v 1.2 2011/10/03 13:36:01 voyageur Exp $
-
-EAPI="3"
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-# Upstream silently re-released the tarball...
-# drop the -> in 2.9
-SRC_URI="http://llvm.org/releases/${PV}/${P}.tgz -> ${P}-r1.tgz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug +libffi llvm-gcc multitarget ocaml test udis86 vim-syntax"
-
-DEPEND="dev-lang/perl
-	>=sys-devel/make-3.79
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.875d
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 )
-	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
-	libffi? ( dev-util/pkgconfig
-		virtual/libffi )
-	ocaml? ( dev-lang/ocaml )
-	udis86? ( amd64? ( dev-libs/udis86[pic] )
-		!amd64? ( dev-libs/udis86 ) )"
-RDEPEND="dev-lang/perl
-	libffi? ( virtual/libffi )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-S=${WORKDIR}/${PN}-${PV/_pre*}
-
-pkg_setup() {
-	# need to check if the active compiler is ok
-
-	broken_gcc=" 3.2.2 3.2.3 3.3.2 4.1.1 "
-	broken_gcc_x86=" 3.4.0 3.4.2 "
-	broken_gcc_amd64=" 3.4.6 "
-
-	gcc_vers=$(gcc-fullversion)
-
-	if [[ ${broken_gcc} == *" ${version} "* ]] ; then
-		elog "Your version of gcc is known to miscompile llvm."
-		elog "Check http://www.llvm.org/docs/GettingStarted.html for"
-		elog "possible solutions."
-		die "Your currently active version of gcc is known to miscompile llvm"
-	fi
-
-	if [[ ${CHOST} == i*86-* && ${broken_gcc_x86} == *" ${version} "* ]] ; then
-		elog "Your version of gcc is known to miscompile llvm on x86"
-		elog "architectures.  Check"
-		elog "http://www.llvm.org/docs/GettingStarted.html for possible"
-		elog "solutions."
-		die "Your currently active version of gcc is known to miscompile llvm"
-	fi
-
-	if [[ ${CHOST} == x86_64-* && ${broken_gcc_amd64} == *" ${version} "* ]];
-	then
-		 elog "Your version of gcc is known to miscompile llvm in amd64"
-		 elog "architectures.  Check"
-		 elog "http://www.llvm.org/docs/GettingStarted.html for possible"
-		 elog "solutions."
-		die "Your currently active version of gcc is known to miscompile llvm"
-	 fi
-}
-
-src_prepare() {
-	# unfortunately ./configure won't listen to --mandir and the-like, so take
-	# care of this.
-	einfo "Fixing install dirs"
-	sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \
-		-e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \
-		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/${PN}, \
-		-i Makefile.config.in || die "Makefile.config sed failed"
-	sed -e 's,$ABS_RUN_DIR/lib,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
-		-i tools/llvm-config/llvm-config.in.in || die "llvm-config sed failed"
-
-	einfo "Fixing rpath"
-	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
-		-i Makefile.rules || die "rpath sed failed"
-
-	epatch "${FILESDIR}"/${PN}-2.7-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
-	epatch "${FILESDIR}"/${PN}-2.8-darwin8.patch
-	# Upstream backport, r117774
-	epatch "${FILESDIR}"/${P}-alignof.patch
-}
-
-src_configure() {
-	local CONF_FLAGS="--enable-shared
-		$(use_enable !debug optimized)
-		$(use_enable debug assertions)
-		$(use_enable debug expensive-checks)"
-
-	if use multitarget; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
-	else
-		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
-	fi
-
-	if use amd64; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
-	fi
-
-	# things would be built differently depending on whether llvm-gcc is
-	# used or not.
-	local LLVM_GCC_DIR=/dev/null
-	local LLVM_GCC_DRIVER=nope ; local LLVM_GPP_DRIVER=nope
-	if use llvm-gcc ; then
-		if has_version sys-devel/llvm-gcc; then
-			LLVM_GCC_DIR=$(ls -d ${EROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null)
-			LLVM_GCC_DRIVER=$(find ${LLVM_GCC_DIR} -name 'llvm*-gcc' 2> /dev/null)
-			if [[ -z ${LLVM_GCC_DRIVER} ]] ; then
-				die "failed to find installed llvm-gcc, LLVM_GCC_DIR=${LLVM_GCC_DIR}"
-			fi
-			einfo "Using $LLVM_GCC_DRIVER"
-			LLVM_GPP_DRIVER=${LLVM_GCC_DRIVER/%-gcc/-g++}
-		else
-			eerror "llvm-gcc USE flag enabled, but sys-devel/llvm-gcc was not found"
-			eerror "Building with standard gcc, re-merge this package after installing"
-			eerror "llvm-gcc to build with it"
-			eerror "This is normal behavior on first LLVM merge"
-		fi
-	fi
-
-	CONF_FLAGS="${CONF_FLAGS} \
-		--with-llvmgccdir=${LLVM_GCC_DIR} \
-		--with-llvmgcc=${LLVM_GCC_DRIVER} \
-		--with-llvmgxx=${LLVM_GPP_DRIVER}"
-
-	if use ocaml; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml"
-	else
-		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=none"
-	fi
-
-	if use udis86; then
-		CONF_FLAGS="${CONF_FLAGS} --with-udis86"
-	fi
-
-	if use libffi; then
-		append-cppflags "$(pkg-config --cflags libffi)"
-	fi
-	CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)"
-	econf ${CONF_FLAGS} || die "econf failed"
-}
-
-src_compile() {
-	emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 || die "emake failed"
-}
-
-src_install() {
-	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins utils/vim/*.vim
-	fi
-
-	# Fix install_names on Darwin.  The build system is too complicated
-	# to just fix this, so we correct it post-install
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		for lib in lib{EnhancedDisassembly,LLVM-${PV},BugpointPasses,LLVMHello,LTO,profile_rt}.dylib ; do
-			# libEnhancedDisassembly is Darwin10 only, so non-fatal
-			[[ -f ${ED}/usr/lib/${PN}/${lib} ]] || continue
-			ebegin "fixing install_name of $lib"
-			install_name_tool \
-				-id "${EPREFIX}"/usr/lib/${PN}/${lib} \
-				"${ED}"/usr/lib/${PN}/${lib}
-			eend $?
-		done
-		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do
-			ebegin "fixing install_name reference to libLLVM-${PV}.dylib of ${f##*/}"
-			install_name_tool \
-				-change "${S}"/Release/lib/libLLVM-${PV}.dylib \
-					"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \
-				"${f}"
-			eend $?
-		done
-	fi
-}
diff --git a/sys-devel/llvm/llvm-2.9-r2.ebuild b/sys-devel/llvm/llvm-2.9-r2.ebuild
index 27543d5cd22b..429890a31f81 100644
--- a/sys-devel/llvm/llvm-2.9-r2.ebuild
+++ b/sys-devel/llvm/llvm-2.9-r2.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/llvm/llvm-2.9-r2.ebuild,v 1.2 2011/10/03 13:36:01 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.9-r2.ebuild,v 1.3 2011/10/04 11:43:37 voyageur Exp $
 
 EAPI="3"
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -76,8 +76,9 @@ src_prepare() {
 	sed -e 's,$ABS_RUN_DIR/lib,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
 		-i tools/llvm-config/llvm-config.in.in || die "llvm-config sed failed"
 
-	einfo "Fixing rpath"
+	einfo "Fixing rpath and CFLAGS"
 	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
+		-e '/OmitFramePointer/s/-fomit-frame-pointer//' \
 		-i Makefile.rules || die "rpath sed failed"
 
 	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
@@ -89,6 +90,7 @@ src_prepare() {
 
 src_configure() {
 	local CONF_FLAGS="--enable-shared
+		--with-optimize-option=
 		$(use_enable !debug optimized)
 		$(use_enable debug assertions)
 		$(use_enable debug expensive-checks)"
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 34232e6de259..2d567c186d72 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-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/llvm/llvm-9999.ebuild,v 1.14 2011/10/03 13:36:01 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.15 2011/10/04 11:43:37 voyageur Exp $
 
 EAPI="3"
 inherit subversion eutils flag-o-matic multilib toolchain-funcs
@@ -77,8 +77,9 @@ src_prepare() {
 	sed -e 's,$ABS_RUN_DIR/lib,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
 		-i tools/llvm-config/llvm-config.in.in || die "llvm-config sed failed"
 
-	einfo "Fixing rpath"
+	einfo "Fixing rpath and CFLAGS"
 	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
+		-e '/OmitFramePointer/s/-fomit-frame-pointer//' \
 		-i Makefile.rules || die "rpath sed failed"
 
 	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
@@ -87,6 +88,7 @@ src_prepare() {
 
 src_configure() {
 	local CONF_FLAGS="--enable-shared
+		--with-optimize-option=
 		$(use_enable !debug optimized)
 		$(use_enable debug assertions)
 		$(use_enable debug expensive-checks)"