Also update 2.8 branch with libffi/debug changes

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

4 files changed, 25 insertions, 205 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index d40a63d1e1f2..b2ffeae494c6 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.38 2011/04/15 16:02:59 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.39 2011/04/15 17:28:55 voyageur Exp $
+
+*llvm-2.8-r4 (15 Apr 2011)
+
+  15 Apr 2011; Bernard Cafarelli <voyageur@gentoo.org> -llvm-2.8-r3.ebuild,
+  +llvm-2.8-r4.ebuild, -llvm-2.9.ebuild:
+  Also update 2.8 branch with libffi/debug changes
 
 *llvm-2.9-r1 (15 Apr 2011)
 
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index d19c081226be..66883edec68d 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -10,16 +10,15 @@ DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA
 DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
 EBUILD llvm-2.8-r1.ebuild 6029 RMD160 4adbf75b2c9639fa55703cc72d7c47758f5e23b5 SHA1 c6a312609a19bcc8c8eb4e728540df5140a07650 SHA256 65d899bf69315ac21d0a741b190e80430b27815b5457075bc9eee36e79da6b57
 EBUILD llvm-2.8-r2.ebuild 6112 RMD160 f65c80199c3a3642fb0c4e69d66d3cd6df4f1aba SHA1 7b88bbb208464eb285f5597e6e5cf4f396363c34 SHA256 34eeebb434b00a48df0a6bb00a95e91dff91eb2dc2e9207dc0429fa3531f1b3c
-EBUILD llvm-2.8-r3.ebuild 6275 RMD160 986c0cf324a21b309b6592d5cb6fdb16cf9a8ce6 SHA1 5274a9db515b1bc68d733790b6f4744376054f5a SHA256 1f30ec5a1e17a8d7f9790436409de41e19ad9e491333030059a8993a70bb1b2e
+EBUILD llvm-2.8-r4.ebuild 6177 RMD160 a007533f6e237c58b66e8ee6010ba84911ab1285 SHA1 2a7677609003eb00c7230b38a6fd2631404a8325 SHA256 017ead4a7f2fd6a2aa48019bbec5dc31860d814841e698e6c5a3033c690e5431
 EBUILD llvm-2.9-r1.ebuild 5977 RMD160 3bf1f384e72edeb80c60c121a362eba7e416d496 SHA1 5bf4d41baa846ea4ec011e9d5275bed5c3d7dbf6 SHA256 b29614ee1f08cbb9445dd1047b8cd2764a68b6092bccb15bda4f22110e569d51
-EBUILD llvm-2.9.ebuild 6072 RMD160 67a3d7f73c957a45343a84b7155626c0617563e0 SHA1 ab651de55bd17950852a2732656f75f2cf7f4082 SHA256 15bc19af60059cd52041222434234012a566fe3febc2c9094101aac50916aa33
 EBUILD llvm-9999.ebuild 5892 RMD160 f5fbe56fa323f530dc09f43590f004dd97b6c2de SHA1 932aaa60f2ed6881b99bce2a88c3c14e35fbf3fc SHA256 8593e5bc105b4be1399e36f97e7483e5d134900df37f3f0aecabbd8d3e76a4e1
-MISC ChangeLog 6288 RMD160 ff71ed26af9b33f930be50704ff02fdd690e73b6 SHA1 20e970672e6e7a2988441455387233873d6f1976 SHA256 c3b06ecfd024338d9a15ce734dce8d99d490e94ac9045a527efc85357c9fa525
+MISC ChangeLog 6485 RMD160 40fdf31ca182aeefdbe2c679f5378aea1f64e5e9 SHA1 21cbd5686e1754f425034aaa699819cba17a99b0 SHA256 ba6de4400f3620a8dd3d1b8bd2c5208a3602bdc4d6aa9a6f31566b1c1ee7ecc0
 MISC metadata.xml 2384 RMD160 9e29d256ab1d3d7cc23fe25d170a1716b6e35dba SHA1 db599887234c1013a7849be3e1b6bd399c716598 SHA256 44f73ce01ca8dc1d2fea546bb70550d6324ed893a224a6db8e55fd932b3a10f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2obEMACgkQFYEBGcdFJfKEtgEArNUjnD7Ftpfa3edh7dxk/N71
-JAN/w1AvKgTzmQx7OwQA/2waFPvv4Djy3/dudtccR9lKWq6nM05tXykYSWEgUyku
-=ZE9b
+iF4EAREIAAYFAk2ogGgACgkQFYEBGcdFJfL6HAEAoW0385kmivWK+1HF9IEXRdmN
+4YlgsVXwi08E/FqfvB0A/R/q7gbvPT8oUxpm9KNMUTFtBXdPBefqQVTSd4dEGOEY
+=/NoS
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-2.8-r3.ebuild b/sys-devel/llvm/llvm-2.8-r4.ebuild
index d1f7a5e781c3..22e9e5e23a62 100644
--- a/sys-devel/llvm/llvm-2.8-r3.ebuild
+++ b/sys-devel/llvm/llvm-2.8-r4.ebuild
@@ -1,9 +1,9 @@
 # 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-r3.ebuild,v 1.1 2011/03/28 14:02:53 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.8-r4.ebuild,v 1.1 2011/04/15 17:28:55 voyageur Exp $
 
 EAPI="3"
-inherit eutils multilib toolchain-funcs
+inherit eutils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="http://llvm.org/"
@@ -24,11 +24,13 @@ DEPEND="dev-lang/perl
 	!~sys-devel/bison-1.875
 	|| ( >=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? ( virtual/libffi )
+	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*}
@@ -90,18 +92,10 @@ src_prepare() {
 }
 
 src_configure() {
-	local CONF_FLAGS="--enable-shared"
-
-	if use debug; then
-		CONF_FLAGS="${CONF_FLAGS} --disable-optimized"
-		einfo "Note: Compiling LLVM in debug mode will create huge and slow binaries"
-		# ...and you probably shouldn't use tmpfs, unless it can hold 900MB
-	else
-		CONF_FLAGS="${CONF_FLAGS} \
-			--enable-optimized \
-			--disable-assertions \
-			--disable-expensive-checks"
-	fi
+	local CONF_FLAGS="--enable-shared
+		$(use_enable !debug optimized)
+		$(use_enable debug assertions)
+		$(use_enable debug expensive-checks)"
 
 	if use alltargets; then
 		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
@@ -148,6 +142,10 @@ src_configure() {
 	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"
 }
diff --git a/sys-devel/llvm/llvm-2.9.ebuild b/sys-devel/llvm/llvm-2.9.ebuild
deleted file mode 100644
index 3a4b4adae80a..000000000000
--- a/sys-devel/llvm/llvm-2.9.ebuild
+++ /dev/null
@@ -1,183 +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.9.ebuild,v 1.1 2011/04/07 09:29:31 voyageur Exp $
-
-EAPI="3"
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.tgz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="alltargets debug +libffi llvm-gcc ocaml test udis86 vim-syntax"
-
-DEPEND="dev-lang/perl
-	>=sys-devel/make-3.79
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.28
-	!~sys-devel/bison-1.85
-	!~sys-devel/bison-1.875
-	|| ( >=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? ( virtual/libffi )
-	ocaml? ( dev-lang/ocaml )
-	udis86? ( amd64? ( dev-libs/udis86[pic] )
-		!amd64? ( dev-libs/udis86 ) )"
-RDEPEND="dev-lang/perl
-	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.6-commandguide-nops.patch
-	epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch
-}
-
-src_configure() {
-	local CONF_FLAGS="--enable-shared"
-
-	if use debug; then
-		CONF_FLAGS="${CONF_FLAGS} --disable-optimized"
-		einfo "Note: Compiling LLVM in debug mode will create huge and slow binaries"
-		# ...and you probably shouldn't use tmpfs, unless it can hold 900MB
-	else
-		CONF_FLAGS="${CONF_FLAGS} \
-			--enable-optimized \
-			--disable-assertions \
-			--disable-expensive-checks"
-	fi
-
-	if use alltargets; 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
-	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
-}