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 E95411381F3 for ; Fri, 19 Jul 2013 21:24:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6149EE0984; Fri, 19 Jul 2013 21:24:17 +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 D8C0BE0984 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 E7A8833E917 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 65952E4B05 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: <1374258617.e4866ca37424bf0503850780543463b50f7f501c.mgorny@gentoo> Subject: [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/files/ X-VCS-Repository: dev/mgorny X-VCS-Files: sys-devel/llvm/files/llvm-3.4-gentoo-install.patch X-VCS-Directories: sys-devel/llvm/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e4866ca37424bf0503850780543463b50f7f501c 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: 6b89530a-b4f5-4eea-8de3-e37fc04083b8 X-Archives-Hash: 8de0baea83e925186213a0d5f5aef684 commit: e4866ca37424bf0503850780543463b50f7f501c Author: Michał Górny gentoo org> AuthorDate: Fri Jul 19 18:30:17 2013 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jul 19 18:30:17 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=e4866ca3 Fix broken rpaths for llvm-9999 as well. It seems that I was mistaken and both versions need $ORIGIN. --- sys-devel/llvm/files/llvm-3.4-gentoo-install.patch | 4 ++-- 1 file changed, 2 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 2798fa7..a1a27c9 100644 --- a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch +++ b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch @@ -55,12 +55,12 @@ index 1bc78f1..60cd228 100644 ifneq ($(HOST_OS), Darwin) ifdef TOOLNAME - LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(DynamicFlag) -+ LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag) ++ LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag) endif else ifneq ($(DARWIN_MAJVERS),4) - LD.Flags += $(RPATH) -Wl,@executable_path/../lib -+ LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)' ++ LD.Flags += $(RPATH) -Wl,@executable_path/../lib $(RPATH) -Wl,'$(PROJ_libdir)' endif ifeq ($(RC_XBS),YES) TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX)