diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2009-11-17 10:14:09 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2009-11-17 10:14:09 +0000 |
| commit | 9a7b4b5ff81fbd7934ffa6c48c85ebac95f171e3 (patch) | |
| tree | 6b02419abee90c308ed11556923700f000b2682a /sys-devel/llvm | |
| parent | Add gconf USE flag. (diff) | |
| download | gentoo-2-9a7b4b5ff81fbd7934ffa6c48c85ebac95f171e3.tar.gz gentoo-2-9a7b4b5ff81fbd7934ffa6c48c85ebac95f171e3.tar.bz2 gentoo-2-9a7b4b5ff81fbd7934ffa6c48c85ebac95f171e3.zip | |
Drop llvm-gcc depend, as it triggers circular dependency on first install (warn the user if it is not found instead), bug #293382
(Portage version: 2.2_rc50/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel/llvm')
| -rw-r--r-- | sys-devel/llvm/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/llvm/llvm-2.6.ebuild | 23 |
2 files changed, 19 insertions, 10 deletions
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog index 632058a58fd1..030520260cd6 100644 --- a/sys-devel/llvm/ChangeLog +++ b/sys-devel/llvm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/llvm # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.7 2009/10/26 16:38:22 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.8 2009/11/17 10:14:09 voyageur Exp $ + + 17 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org> llvm-2.6.ebuild: + Drop llvm-gcc depend, as it triggers circular dependency on first install + (warn the user if it is not found instead), bug #293382 26 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org> files/llvm-2.6-commandguide-nops.patch: diff --git a/sys-devel/llvm/llvm-2.6.ebuild b/sys-devel/llvm/llvm-2.6.ebuild index 1a9048bd80c8..173fb697d9f8 100644 --- a/sys-devel/llvm/llvm-2.6.ebuild +++ b/sys-devel/llvm/llvm-2.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.6.ebuild,v 1.3 2009/10/26 16:16:40 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.6.ebuild,v 1.4 2009/11/17 10:14:09 voyageur Exp $ EAPI="2" inherit eutils multilib toolchain-funcs @@ -120,15 +120,20 @@ src_configure() { local LLVM_GCC_DIR=/dev/null local LLVM_GCC_DRIVER=nope ; local LLVM_GPP_DRIVER=nope if use 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}" + 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 - - einfo "Using $LLVM_GCC_DRIVER" - LLVM_GPP_DRIVER=${LLVM_GCC_DRIVER/%-gcc/-g++} fi CONF_FLAGS="${CONF_FLAGS} \ |