From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 62AD9138247 for ; Sat, 28 Dec 2013 14:02:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6423E0A9A; Sat, 28 Dec 2013 14:02:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 748BCE0AB4 for ; Sat, 28 Dec 2013 14:02:21 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8328E33F732 for ; Sat, 28 Dec 2013 14:02:20 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id 4B3DC2004C; Sat, 28 Dec 2013 14:02:19 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-devel/llvm: llvm-9999.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: llvm-9999.ebuild ChangeLog X-VCS-Directories: sys-devel/llvm X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20131228140219.4B3DC2004C@flycatcher.gentoo.org> Date: Sat, 28 Dec 2013 14:02:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a951b6dc-1da4-424e-87c1-238191342837 X-Archives-Hash: 5b0734b105ef23b79dfad679b8c8f234 mgorny 13/12/28 14:02:19 Modified: llvm-9999.ebuild ChangeLog Log: Add bugpoint to built tools. Switch llvm-config wrapping to use $CHOST-llvm-config. (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) Revision Changes Path 1.73 sys-devel/llvm/llvm-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.73&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.73&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.72&r2=1.73 Index: llvm-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- llvm-9999.ebuild 27 Dec 2013 14:43:50 -0000 1.72 +++ llvm-9999.ebuild 28 Dec 2013 14:02:19 -0000 1.73 @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.72 2013/12/27 14:43:50 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.73 2013/12/28 14:02:19 mgorny Exp $ EAPI=5 @@ -277,7 +277,7 @@ llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump llvm-objdump llvm-readobj llvm-rtdyld llvm-dwarfdump llvm-cov llvm-size llvm-stress llvm-mcmarkup llvm-symbolizer obj2yaml - yaml2obj lto + yaml2obj lto bugpoint ) # those tools require 'lto' built first, so we need to delay @@ -357,11 +357,22 @@ emake "${MAKEARGS[@]}" DESTDIR="${D}" install - if multilib_build_binaries; then + # Preserve ABI-variant of llvm-config. + dodir /tmp + mv "${ED}"/usr/bin/llvm-config "${ED}"/tmp/"${CHOST}"-llvm-config || die + + if ! multilib_build_binaries; then + # Drop all the executables since LLVM doesn't like to + # clobber when installing. + rm -r "${ED}"/usr/bin || die + + # Backwards compat, will be happily removed someday. + dosym "${CHOST}"-llvm-config /tmp/llvm-config.${ABI} + else # Move files back. - if path_exists -o "${ED}"/tmp/llvm-config.*; then - mv "${ED}"/tmp/llvm-config.* "${ED}"/usr/bin || die - fi + mv "${ED}"/tmp/*llvm-config* "${ED}"/usr/bin || die + # Create a symlink for host's llvm-config. + dosym "${CHOST}"-llvm-config /usr/bin/llvm-config # Install docs. doman "${S}"/docs/_build/man/*.1 @@ -377,13 +388,6 @@ # install cmake modules emake -C "${S%/}"_cmake/cmake/modules DESTDIR="${D}" install - else - # Preserve ABI-variant of llvm-config, - # then drop all the executables since LLVM doesn't like to - # clobber when installing. - mkdir -p "${ED}"/tmp || die - mv "${ED}"/usr/bin/llvm-config "${ED}"/tmp/llvm-config.${ABI} || die - rm -r "${ED}"/usr/bin || die fi # Fix install_names on Darwin. The build system is too complicated 1.159 sys-devel/llvm/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.159&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.159&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.158&r2=1.159 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- ChangeLog 27 Dec 2013 14:43:50 -0000 1.158 +++ ChangeLog 28 Dec 2013 14:02:19 -0000 1.159 @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/llvm # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.158 2013/12/27 14:43:50 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.159 2013/12/28 14:02:19 mgorny Exp $ + + 28 Dec 2013; Michał Górny llvm-9999.ebuild: + Add bugpoint to built tools. Switch llvm-config wrapping to use $CHOST-llvm- + config. 27 Dec 2013; Michał Górny llvm-9999.ebuild: Update/fix dependencies.