Add udis86 support, thanks to chithanh in bug #317151

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 176 insertions, 3 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 62942723be9a..348c4dba6cc5 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/llvm
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.10 2010/04/26 09:38:19 voyageur Exp $
+
+*llvm-2.6-r2 (26 Apr 2010)
+
+  26 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org> +llvm-2.6-r2.ebuild,
+  metadata.xml:
+  Add udis86 support, thanks to chithanh in bug #317151
 
 *llvm-2.6-r1 (18 Mar 2010)
 
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 3ac1fa475af6..c996e4049ddd 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -3,5 +3,6 @@ AUX llvm-2.6-commandguide-nops.patch 975 RMD160 1178c27a8845c2c86d6d381ba3d95b4b
 AUX llvm-2.6-nodoctargz.patch 1602 RMD160 b4de7f5e68386bd9dab44a6d7addae0eb9d7f958 SHA1 5a2faf5d9c52f1eb1f1eac3aa69b6d0499c093a4 SHA256 503d31616ca7c76f6da1cd46d6e7c54241effbd11652ab568759350f0c21e473
 DIST llvm-2.6.tar.gz 7790380 RMD160 24d58cb052ab5879aae59eaf4885ec41186ee22a SHA1 547471147cbf6d3e49539e01196ffada2c79c250 SHA256 4cd9257350c5ff8b9b139d19497e2396c0604eef0e5d6504f5c1463b09bf2d84
 EBUILD llvm-2.6-r1.ebuild 5213 RMD160 ae3d0e9a544cc7432b79a5901de306b28b02c00d SHA1 890a614e13fe8c4343fa2e041f79ca9bf1e3b6fb SHA256 ae82cba7a32104537097644ce330e89d7725a01abe2e11b135af338044ad7b62
-MISC ChangeLog 1830 RMD160 7b5d257662dfbe2b4471f1502505e82906857d4e SHA1 43e4619af410aab0123513ac63433e14722e2233 SHA256 784dd6180fa75a5c69f61bb0ce1eefe18bf904f494bc5523cfde029edbd9171d
-MISC metadata.xml 2288 RMD160 af9be4ed48671eb880b16f7be6fd0f4cce20e05e SHA1 c5c0bcb6379a43f938fa9746acac91de66021af1 SHA256 7ee8a761be956332d626157b4eda36fd907ecb82609c4dbbbe5ce0a26632ece2
+EBUILD llvm-2.6-r2.ebuild 5296 RMD160 5e409c4c41ab740ddf5ae63e4dd87dfa9d3b3e64 SHA1 0a9f7ee7488df5b0cee37e3d8b02fb74ec16eb51 SHA256 c6d80219eb255ed03379ee75d04d7e70964f059661eb6beec5117d410d1a5137
+MISC ChangeLog 2008 RMD160 7e51dc7bfb9f17640d7f1cb7d69fb9603c3d66df SHA1 085354b82e076adfc74f7425f808df006841bd20 SHA256 dd635503a090ae77ddcb47ab59dff1dcdffc0b8eaf4ded4be71c3920fa0adcf2
+MISC metadata.xml 2384 RMD160 9e29d256ab1d3d7cc23fe25d170a1716b6e35dba SHA1 db599887234c1013a7849be3e1b6bd399c716598 SHA256 44f73ce01ca8dc1d2fea546bb70550d6324ed893a224a6db8e55fd932b3a10f8
diff --git a/sys-devel/llvm/llvm-2.6-r2.ebuild b/sys-devel/llvm/llvm-2.6-r2.ebuild
new file mode 100644
index 000000000000..3eac75b1909a
--- /dev/null
+++ b/sys-devel/llvm/llvm-2.6-r2.ebuild
@@ -0,0 +1,165 @@
+# 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-r2.ebuild,v 1.1 2010/04/26 09:38:19 voyageur Exp $
+
+EAPI="2"
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="http://llvm.org/"
+SRC_URI="http://llvm.org/releases/${PV}/${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alltargets debug +libffi llvm-gcc ocaml test udis86"
+
+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/binutils-2.18
+	libffi? ( virtual/libffi )
+	llvm-gcc? ( sys-devel/llvm-gcc )
+	ocaml? ( dev-lang/ocaml )
+	test? ( dev-util/dejagnu )
+	udis86? ( dev-libs/udis86 )"
+RDEPEND="dev-lang/perl"
+
+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 := $(DESTDIR)$(PROJ_prefix)/share/doc/'${PF}, \
+		-e 's,^PROJ_etcdir.*,PROJ_etcdir := $(DESTDIR)/etc/llvm,' \
+		-e 's,^PROJ_libdir.*,PROJ_libdir := $(DESTDIR)/usr/'$(get_libdir), \
+		-i Makefile.config.in || die "sed failed"
+
+	# this points by default to the build directory
+	einfo "Fixing gccld and gccas"
+	sed -e 's,^TOOLDIR.*,TOOLDIR=/usr/bin,' \
+		-i tools/gccld/gccld.sh tools/gccas/gccas.sh || die "sed failed"
+
+	einfo "Fixing rpath"
+	sed -e 's/\$(RPATH) -Wl,\$(\(ToolDir\|LibDir\))//g' -i Makefile.rules || die "sed failed"
+
+	# Fix docs installation
+	sed -e '/^NO_INSTALL_MANS/s/$/$(DST_MAN_DIR)tblgen.1 $(DST_MAN_DIR)llvmgcc.1 $(DST_MAN_DIR)llvmgxx.1/' \
+		-i docs/CommandGuide/Makefile || die "manpages sed failed"
+	epatch "${FILESDIR}"/${PN}-2.6-nodoctargz.patch
+	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
+
+	# 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() {
+	local CONF_FLAGS=""
+
+	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 ${ROOT}/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
+
+	CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)"
+	CONF_FLAGS="${CONF_FLAGS} $(use_with udis86)"
+	econf ${CONF_FLAGS} || die "econf failed"
+}
+
+src_compile() {
+	emake VERBOSE=1 KEEP_SYMBOLS=1 || die "emake failed"
+}
+
+src_install() {
+	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
+}
diff --git a/sys-devel/llvm/metadata.xml b/sys-devel/llvm/metadata.xml
index 3f5032393a6a..87bf44cec665 100644
--- a/sys-devel/llvm/metadata.xml
+++ b/sys-devel/llvm/metadata.xml
@@ -15,5 +15,6 @@
 		<flag name='alltargets'>Build all host targets (default: host only)</flag>
 		<flag name='libffi'>Add support to call arbitrary external (natively compiled) functions via <pkg>dev-libs/libffi</pkg></flag>
 		<flag name='llvm-gcc'>Build LLVM with <pkg>sys-devel/llvm-gcc</pkg></flag>
+		<flag name='udis86'>Enable support for <pkg>dev-libs/udis86</pkg> disassembler library</flag>
 	</use>
 </pkgmetadata>