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 EBA08138200 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 CA9A6E0957; 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 05503E0957 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 E696333E7BA for ; Fri, 19 Jul 2013 21:24:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 87E20E545F 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: <1374259323.91d28ee0414e6e767c96e8cbd167979fe5127229.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: 91d28ee0414e6e767c96e8cbd167979fe5127229 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: 28ed6956-1ea8-4d93-b8ce-80b853731426 X-Archives-Hash: bbc255c8027262f7ef2fde2e41e87b00 commit: 91d28ee0414e6e767c96e8cbd167979fe5127229 Author: Michał Górny gentoo org> AuthorDate: Fri Jul 19 18:42:03 2013 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jul 19 18:42:03 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=91d28ee0 llvm-9999: add RPATH to 'llvm-config --ldflags'. --- sys-devel/llvm/files/llvm-3.4-gentoo-install.patch | 50 ++++++++++++++++++---- 1 file changed, 42 insertions(+), 8 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 a1a27c9..2493674 100644 --- a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch +++ b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch @@ -1,15 +1,17 @@ -From cdc2bf59ab8200a4bd6b0eb66ac5b8a8ebab67d6 Mon Sep 17 00:00:00 2001 +From f0927633bf1d6426624f1c266b1407b18ac1cd80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 19 Jul 2013 10:10:52 +0200 Subject: [PATCH] gentoo install fixes --- - Makefile.config.in | 6 +++--- - Makefile.rules | 7 +++---- - tools/gold/Makefile | 2 +- - tools/llvm-config/llvm-config.cpp | 2 +- - utils/FileCheck/Makefile | 2 +- - 5 files changed, 9 insertions(+), 10 deletions(-) + Makefile.config.in | 6 +++--- + Makefile.rules | 7 +++---- + tools/gold/Makefile | 2 +- + tools/llvm-config/BuildVariables.inc.in | 1 + + tools/llvm-config/Makefile | 2 ++ + tools/llvm-config/llvm-config.cpp | 5 +++-- + utils/FileCheck/Makefile | 2 +- + 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index dcca45f..45bf0d1 100644 @@ -77,8 +79,30 @@ index 496e31c..d36b340 100644 include $(LEVEL)/Makefile.common +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index fe87afb..2afaaea 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -25,3 +25,4 @@ + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" + #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" ++#define LLVM_RPATH "@LLVM_RPATH@" +diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile +index b20b6bf..3747baf 100644 +--- a/tools/llvm-config/Makefile ++++ b/tools/llvm-config/Makefile +@@ -55,6 +55,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir + >> temp.sed + $(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \ + >> temp.sed ++ $(Verb) $(ECHO) 's/@LLVM_RPATH@/$(subst /,\/,$(RPATH))/' \ ++ >> temp.sed + $(Verb) $(SED) -f temp.sed < $< > $@ + $(Verb) $(RM) temp.sed + diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 3924e2e..d087ae0 100644 +index 3924e2e..169e8bf 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp @@ -250,7 +250,7 @@ int main(int argc, char **argv) { @@ -90,6 +114,16 @@ index 3924e2e..d087ae0 100644 ActiveIncludeOption = "-I" + ActiveIncludeDir; } +@@ -277,7 +277,8 @@ int main(int argc, char **argv) { + } else if (Arg == "--cxxflags") { + OS << ActiveIncludeOption << ' ' << LLVM_CXXFLAGS << '\n'; + } else if (Arg == "--ldflags") { +- OS << "-L" << ActiveLibDir << ' ' << LLVM_LDFLAGS ++ OS << "-L" << ActiveLibDir << ' ' ++ << LLVM_RPATH << " -Wl," << ActiveLibDir << ' ' << LLVM_LDFLAGS + << ' ' << LLVM_SYSTEM_LIBS << '\n'; + } else if (Arg == "--libs") { + PrintLibs = true; diff --git a/utils/FileCheck/Makefile b/utils/FileCheck/Makefile index 268b7bc..e7674f9 100644 --- a/utils/FileCheck/Makefile