| 1 |
commit: 99e47f0307cf265b96d7a428b443d98f50e789cf |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 31 15:54:20 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 31 21:11:25 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e47f03 |
| 7 |
|
| 8 |
sys-devel/llvm: Fix llvm-config --obj-root on the live ebuild |
| 9 |
|
| 10 |
...-Clean-up-exported-values-update-for-shar.patch | 25 ++++++++-------------- |
| 11 |
1 file changed, 9 insertions(+), 16 deletions(-) |
| 12 |
|
| 13 |
diff --git a/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
| 14 |
index 968db45..0ae66bd 100644 |
| 15 |
--- a/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
| 16 |
+++ b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
| 17 |
@@ -1,14 +1,14 @@ |
| 18 |
-From 2dba8c81db58d7dd62c67379eaa175498a4370f2 Mon Sep 17 00:00:00 2001 |
| 19 |
+From df2ea14b7c07dd7cf3e33f2e66f36af8af3b425e Mon Sep 17 00:00:00 2001 |
| 20 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 21 |
Date: Sat, 20 Aug 2016 23:47:41 +0200 |
| 22 |
-Subject: [PATCH 07/10] llvm-config: Clean up exported values, update for |
| 23 |
- shared linking |
| 24 |
+Subject: [PATCH 6/9] llvm-config: Clean up exported values, update for shared |
| 25 |
+ linking |
| 26 |
|
| 27 |
Gentoo-specific fixup for llvm-config, including: |
| 28 |
- wiping build-specific CFLAGS, CXXFLAGS, |
| 29 |
- updating library suffixes for shared libs, |
| 30 |
- wiping --system-libs for shared linking, |
| 31 |
-- making --obj-root and --src-root return invalid path (/dev/null), |
| 32 |
+- making --src-root return invalid path (/dev/null), |
| 33 |
- making --build-mode return "Release" rather than "Gentoo". |
| 34 |
|
| 35 |
Thanks to Steven Newbury for the initial patch. |
| 36 |
@@ -17,8 +17,8 @@ Bug: https://bugs.gentoo.org/565358 |
| 37 |
Bug: https://bugs.gentoo.org/501684 |
| 38 |
--- |
| 39 |
tools/llvm-config/CMakeLists.txt | 11 ++++++++--- |
| 40 |
- tools/llvm-config/llvm-config.cpp | 15 ++++++++++++--- |
| 41 |
- 2 files changed, 20 insertions(+), 6 deletions(-) |
| 42 |
+ tools/llvm-config/llvm-config.cpp | 9 +++++++-- |
| 43 |
+ 2 files changed, 15 insertions(+), 5 deletions(-) |
| 44 |
|
| 45 |
diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt |
| 46 |
index 744fa4e..593788a 100644 |
| 47 |
@@ -50,7 +50,7 @@ index 744fa4e..593788a 100644 |
| 48 |
set(LLVM_ENABLE_SHARED ON) |
| 49 |
else() |
| 50 |
diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp |
| 51 |
-index c63733f..ead11b9 100644 |
| 52 |
+index c63733f..3162091 100644 |
| 53 |
--- a/tools/llvm-config/llvm-config.cpp |
| 54 |
+++ b/tools/llvm-config/llvm-config.cpp |
| 55 |
@@ -522,7 +522,8 @@ int main(int argc, char **argv) { |
| 56 |
@@ -63,16 +63,9 @@ index c63733f..ead11b9 100644 |
| 57 |
} else if (Arg == "--assertion-mode") { |
| 58 |
#if defined(NDEBUG) |
| 59 |
OS << "OFF\n"; |
| 60 |
-@@ -538,9 +539,17 @@ int main(int argc, char **argv) { |
| 61 |
- } else if (Arg == "--shared-mode") { |
| 62 |
- PrintSharedMode = true; |
| 63 |
+@@ -540,7 +541,11 @@ int main(int argc, char **argv) { |
| 64 |
} else if (Arg == "--obj-root") { |
| 65 |
-- OS << ActivePrefix << '\n'; |
| 66 |
-+ if (IsInDevelopmentTree) { |
| 67 |
-+ OS << ActivePrefix << '\n'; |
| 68 |
-+ } else { |
| 69 |
-+ OS << "/dev/null\n"; |
| 70 |
-+ } |
| 71 |
+ OS << ActivePrefix << '\n'; |
| 72 |
} else if (Arg == "--src-root") { |
| 73 |
- OS << LLVM_SRC_ROOT << '\n'; |
| 74 |
+ if (IsInDevelopmentTree) { |
Archives