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 E14251381F3 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 A485FE094C; 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 F076EE094C for ; Fri, 19 Jul 2013 21:24:15 +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 0ED1733E8EF 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 A50A0E5461 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: <1374261508.700f2c0ea97d728e57aa0b73271b84429dad485f.mgorny@gentoo> Subject: [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/files/, sys-devel/llvm/ X-VCS-Repository: dev/mgorny X-VCS-Files: sys-devel/llvm/files/llvm-3.4-gentoo-install.patch sys-devel/llvm/llvm-9999-r1.ebuild X-VCS-Directories: sys-devel/llvm/files/ sys-devel/llvm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 700f2c0ea97d728e57aa0b73271b84429dad485f 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: 4a08ac30-bead-4072-93eb-38e5b020b081 X-Archives-Hash: 84281d5bd7f7e250fde8a9b183121c0f commit: 700f2c0ea97d728e57aa0b73271b84429dad485f Author: Michał Górny gentoo org> AuthorDate: Fri Jul 19 19:18:28 2013 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jul 19 19:18:28 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=700f2c0e llvm-9999: add build tree paths to LD_LIBRARY_PATH instead of RPATH. This allows us to keep clean RPATHs in executables while keeping build and tests working. --- sys-devel/llvm/files/llvm-3.4-gentoo-install.patch | 4 ++-- sys-devel/llvm/llvm-9999-r1.ebuild | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch index 2493674..ad3eec1 100644 --- a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch +++ b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch @@ -57,12 +57,12 @@ index 1bc78f1..60cd228 100644 ifneq ($(HOST_OS), Darwin) ifdef TOOLNAME - LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(DynamicFlag) -+ LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag) ++ LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag) endif else ifneq ($(DARWIN_MAJVERS),4) - LD.Flags += $(RPATH) -Wl,@executable_path/../lib -+ LD.Flags += $(RPATH) -Wl,@executable_path/../lib $(RPATH) -Wl,'$(PROJ_libdir)' ++ LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)' endif ifeq ($(RC_XBS),YES) TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX) diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild index e87142d..e3d56dc 100644 --- a/sys-devel/llvm/llvm-9999-r1.ebuild +++ b/sys-devel/llvm/llvm-9999-r1.ebuild @@ -131,6 +131,17 @@ src_prepare() { multilib_copy_sources multilib_foreach_abi multilib_src_prepare + + # Add LLVM built libraries to LD_LIBRARY_PATH. + # This way we don't have to hack RPATHs of executables. + local libpath + if use debug; then + libpath=Debug+Asserts+Checks/lib + else + libpath=Release/lib + fi + + export LD_LIBRARY_PATH=${libpath}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} } multilib_src_configure() {