summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2009-09-28 18:03:59 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2009-09-28 18:03:59 +0000
commitb98a370f30d368b7bb10f26bd7e97e01aeef3b10 (patch)
treec8993aac6260c72dc32aa9dfb58b639c05529ac8
parentMultilib-strict happiness (diff)
downloadgnustep-b98a370f30d368b7bb10f26bd7e97e01aeef3b10.tar.gz
gnustep-b98a370f30d368b7bb10f26bd7e97e01aeef3b10.tar.bz2
gnustep-b98a370f30d368b7bb10f26bd7e97e01aeef3b10.zip
Fix test (finally) and remove llvm-gcc lines for now
svn path=/overlay/; revision=417
-rw-r--r--sys-devel/llvm/Manifest2
-rw-r--r--sys-devel/llvm/llvm-2.6_pre2.ebuild27
2 files changed, 9 insertions, 20 deletions
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index dd027f4..7106056 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,4 +1,4 @@
AUX llvm-2.6-nohtmltargz.patch 649 RMD160 be768d193d174df9ebfea94554525f38fde66ffd SHA1 a873ed000c90e6d58aef16f86a1ee1c1ac112d1a SHA256 b8628c865dc888dcb73a3548f91e1eefa71e49ed57d1e877f7b8e759f34e8109
DIST llvm-2.6_pre2.tar.gz 7782489 RMD160 142751db6e0f130ef6e442c0fe9c5943cab47b9e SHA1 ec4d9ffa1d3dbd8a3f657006d5cc62c5548484ac SHA256 da24eda98e32512e432d6996ccd8007cd0a18b773075e453b7f8058ee33e8f04
-EBUILD llvm-2.6_pre2.ebuild 4425 RMD160 4ddc30ec90a76d3bc2ef4b64a60b20ed6f87e547 SHA1 ee2c63355adca0a0f4b66991084a6fa81df775d9 SHA256 d6ff690f6511e1b26bcc3b8f6bd74f395a11b076adbcb5d90166d4b78c36d1ce
+EBUILD llvm-2.6_pre2.ebuild 4023 RMD160 343ec73a26b24b1f0cae1991afb1ab808bb0b29e SHA1 03a1f6ad60618fabe3c897f98ec45b6532fa8c76 SHA256 94a4dcd01b9bafd6915ff3dc03a60cfd87d2ce1d0427178da6ebbd6e59cfa189
MISC metadata.xml 438 RMD160 7478b7066e7405a8eb1f027415cf2bd7caa04475 SHA1 2a2864afc9fbe29ad42695bd3a2f785586b28ee3 SHA256 2c2ac5110ca326f66f84ba322b4196d883eec8c522cf9791e218231fd6216ce6
diff --git a/sys-devel/llvm/llvm-2.6_pre2.ebuild b/sys-devel/llvm/llvm-2.6_pre2.ebuild
index 3b43fc1..c68b7d3 100644
--- a/sys-devel/llvm/llvm-2.6_pre2.ebuild
+++ b/sys-devel/llvm/llvm-2.6_pre2.ebuild
@@ -71,7 +71,7 @@ src_prepare() {
-e 's,^PROJ_libdir.*,PROJ_libdir := $(DESTDIR)/usr/'$(get_libdir), \
-i Makefile.config.in || die "sed failed"
- # point by default to the build directory
+ # 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"
@@ -83,6 +83,9 @@ src_prepare() {
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-nohtmltargz.patch
+
+ # Buggy test, http://llvm.org/bugs/show_bug.cgi?id=5047
+ rm test/DebugInfo/2009-01-15-dbg_declare.ll
}
src_configure() {
@@ -110,25 +113,11 @@ src_configure() {
fi
# things would be built differently depending on whether llvm-gcc is
- # already present on the system or not.
- local LLVM_GCC_DIR=/dev/null
- local LLVM_GCC_DRIVER=nope ; local LLVM_GPP_DRIVER=nope
- if has_version sys-devel/llvm-gcc ; then
- LLVM_GCC_DIR=$(find /usr/$(get_libdir)/llvm-gcc/ -mindepth 1 -maxdepth 1 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++}
- fi
-
+ # used or not. Forcibly disabled here until someone add llvm-gcc
CONF_FLAGS="${CONF_FLAGS} \
- --with-llvmgccdir=${LLVM_GCC_DIR} \
- --with-llvmgcc=${LLVM_GCC_DRIVER} \
- --with-llvmgxx=${LLVM_GPP_DRIVER}"
+ --with-llvmgccdir=/dev/null \
+ --with-llvmgcc=none \
+ --with-llvmgxx=none"
econf ${CONF_FLAGS} || die "econf failed"
}