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 30065138200 for ; Fri, 19 Jul 2013 21:24:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D31B6E097C; Fri, 19 Jul 2013 21:24:16 +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 22365E097C for ; Fri, 19 Jul 2013 21:24:16 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 311AA33E907 for ; Fri, 19 Jul 2013 21:24:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C1957E5462 for ; Fri, 19 Jul 2013 21:24:13 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1374261683.7a424d0b6ef660829352024d5ce9f7ee8e2af02b.mgorny@gentoo> Subject: [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/ X-VCS-Repository: dev/mgorny X-VCS-Files: sys-devel/llvm/llvm-3.3-r1.ebuild X-VCS-Directories: sys-devel/llvm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7a424d0b6ef660829352024d5ce9f7ee8e2af02b X-VCS-Branch: master Date: Fri, 19 Jul 2013 21:24:13 +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: a5212550-fe79-4ff3-9a7a-e10aa75b4afa X-Archives-Hash: 5ed4a4f6200c58e5b6acd108eb79e15e commit: 7a424d0b6ef660829352024d5ce9f7ee8e2af02b Author: Michał Górny gentoo org> AuthorDate: Fri Jul 19 19:21:23 2013 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jul 19 19:21:23 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=7a424d0b llvm-3.3: move clang moves to src_unpack(). This will ensure that we get the 'final' unpatched tree layout at end of src_unpack() and we can use that to rewrite the patches. --- sys-devel/llvm/llvm-3.3-r1.ebuild | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/sys-devel/llvm/llvm-3.3-r1.ebuild b/sys-devel/llvm/llvm-3.3-r1.ebuild index e422c32..7f12be2 100644 --- a/sys-devel/llvm/llvm-3.3-r1.ebuild +++ b/sys-devel/llvm/llvm-3.3-r1.ebuild @@ -87,6 +87,20 @@ pkg_setup() { fi } +src_unpack() { + default + + rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \ + || die "symlinks removal failed" + + if use clang; then + mv "${WORKDIR}"/cfe-${PV}.src "${S}"/tools/clang \ + || die "clang source directory move failed" + mv "${WORKDIR}"/compiler-rt-${PV}.src "${S}"/projects/compiler-rt \ + || die "compiler-rt source directory move failed" + fi +} + src_prepare() { multilib_src_prepare() { cd "${BUILD_DIR}" || die @@ -110,15 +124,7 @@ src_prepare() { || die "install paths sed failed" } - rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \ - || die "symlinks removal failed" - if use clang; then - mv "${WORKDIR}"/cfe-${PV}.src "${S}"/tools/clang \ - || die "clang source directory move failed" - mv "${WORKDIR}"/compiler-rt-${PV}.src "${S}"/projects/compiler-rt \ - || die "compiler-rt source directory move failed" - # Automatically select active system GCC's libraries, bugs #406163 and #417913 epatch "${FILESDIR}"/clang-3.1-gentoo-runtime-gcc-detection-v3.patch