Add rc release to prepare for 3.0, remove llvm-gcc detection code (not used in configure anymore)

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

4 files changed, 172 insertions, 36 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index b97d4af135be..b50e9b5cfd60 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.47 2011/10/04 11:43:37 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.48 2011/11/09 15:11:05 voyageur Exp $
+
+*llvm-3.0_rc1 (09 Nov 2011)
+
+  09 Nov 2011; Bernard Cafarelli <voyageur@gentoo.org> +llvm-3.0_rc1.ebuild,
+  llvm-9999.ebuild:
+  Add rc release to prepare for 3.0, remove llvm-gcc detection code (not used
+  in configure anymore)
 
   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:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 9a3d4a3afc7a..a9c3f59145ba 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -9,15 +9,17 @@ 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
+DIST llvm-3.0rc1.src.tar.gz 10348118 RMD160 84c9a5911e0e0e4243784b9c6f6c8e1bf18afd59 SHA1 055a2ef81cdabb8e0325f4cba563552b57bb0cc0 SHA256 800d67413f846e7059c05b1748398457e03a7785393c0c565bcfb5248d50edf4
 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
+EBUILD llvm-3.0_rc1.ebuild 5053 RMD160 a5ad413fad52e68a7c384c789905f2ad31ea4aa9 SHA1 b1f8afec213fa4393a355df0a1974400418d4f24 SHA256 f2fe88cac73d0d875dcf77000309c2210a1114cc7e626e46d169beca72183d8f
+EBUILD llvm-9999.ebuild 4974 RMD160 8956e441647bfa6cf3bf15960fd7124cd8e90d28 SHA1 f0d7c502087051edb3b311f15376aace0c357f5c SHA256 080fe2ecb218c0bae613e8031f6cfb50b3fc191bfa9216d244c56432cbb36cf6
+MISC ChangeLog 8048 RMD160 7e031956170b6f6dd7b7fa68923c7986777c45c4 SHA1 02718edc0598cb03e218fb4613e50a3c2cd1b9c7 SHA256 31552d0885cc800ee649093a1ee138513a865ae5adc0cec581e7b09753aa56c9
 MISC metadata.xml 2234 RMD160 b14138857d612a9f5568760b1e70b80f344d978c SHA1 53d1e496b0e80e9acc24fd1cb8858e9efc93d7c0 SHA256 83a322d633e38210fe9946ea92902a17142863fe26578bb1b1bad773952b0419
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6K8XcACgkQFYEBGcdFJfKpIAEAi7hiUPysqysIdctsIML1N1C7
-4DjysZr/5lbEX5n6I+gBAKfeO7YHH8Jn8VnMJxoy4gBfBpMcNug6WTQ90nKV8oT2
-=wn+s
+iF4EAREIAAYFAk66mBYACgkQFYEBGcdFJfK2VQEAh8b/1J7xGVDAiO+DrHWhOKJI
+PKO33zHjf5yYfYPvs88A/iPRhshdzzXL5ABE4VnbB8daoEXCSRr15jglJMK3dKna
+=h37t
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-3.0_rc1.ebuild b/sys-devel/llvm/llvm-3.0_rc1.ebuild
new file mode 100644
index 000000000000..b25e8fb60256
--- /dev/null
+++ b/sys-devel/llvm/llvm-3.0_rc1.ebuild
@@ -0,0 +1,155 @@
+# 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-3.0_rc1.ebuild,v 1.1 2011/11/09 15:11:05 voyageur Exp $
+
+EAPI="3"
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="http://llvm.org/"
+SRC_URI="http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.0_}/sources/${P/_}.src.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug +libffi 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}/${P/_}
+
+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 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
+	epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch
+}
+
+src_configure() {
+	local CONF_FLAGS="--enable-shared
+		--with-optimize-option=
+		$(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
+
+	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},LTO}.dylib {BugpointPasses,LLVMHello,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 "@executable_path/../lib/libLLVM-${PV}.dylib" \
+					"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \
+				"${f}"
+			eend $?
+		done
+	fi
+}
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 2d567c186d72..171369e9b8b6 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.15 2011/10/04 11:43:37 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.16 2011/11/09 15:11:05 voyageur Exp $
 
 EAPI="3"
 inherit subversion eutils flag-o-matic multilib toolchain-funcs
@@ -13,7 +13,7 @@ ESVN_REPO_URI="http://llvm.org/svn/llvm-project/llvm/trunk"
 LICENSE="UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug +libffi llvm-gcc multitarget ocaml test udis86 vim-syntax"
+IUSE="debug +libffi multitarget ocaml test udis86 vim-syntax"
 
 DEPEND="dev-lang/perl
 	>=sys-devel/make-3.79
@@ -30,8 +30,6 @@ 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
 
@@ -103,32 +101,6 @@ src_configure() {
 		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