| 1 |
commit: 9b6a28286598c4d44b14dd3f269057330834b3b7 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 27 10:52:23 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 27 11:00:09 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b6a2828 |
| 7 |
|
| 8 |
sys-devel/llvm: Respect toolchain-funcs pkg-config override, #600622 |
| 9 |
|
| 10 |
sys-devel/llvm/llvm-3.4.2-r100.ebuild | 2 +- |
| 11 |
sys-devel/llvm/llvm-3.5.2.ebuild | 2 +- |
| 12 |
sys-devel/llvm/llvm-3.6.2.ebuild | 2 +- |
| 13 |
sys-devel/llvm/llvm-3.7.1-r3.ebuild | 4 ++-- |
| 14 |
sys-devel/llvm/llvm-3.8.1-r2.ebuild | 4 ++-- |
| 15 |
sys-devel/llvm/llvm-3.8.1.ebuild | 4 ++-- |
| 16 |
sys-devel/llvm/llvm-3.9.0-r1.ebuild | 4 ++-- |
| 17 |
sys-devel/llvm/llvm-9999.ebuild | 4 ++-- |
| 18 |
8 files changed, 13 insertions(+), 13 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-devel/llvm/llvm-3.4.2-r100.ebuild b/sys-devel/llvm/llvm-3.4.2-r100.ebuild |
| 21 |
index 9739437..56a9d13 100644 |
| 22 |
--- a/sys-devel/llvm/llvm-3.4.2-r100.ebuild |
| 23 |
+++ b/sys-devel/llvm/llvm-3.4.2-r100.ebuild |
| 24 |
@@ -174,7 +174,7 @@ multilib_src_configure() { |
| 25 |
|
| 26 |
if use libffi; then |
| 27 |
local CPPFLAGS=${CPPFLAGS} |
| 28 |
- append-cppflags "$(pkg-config --cflags libffi)" |
| 29 |
+ append-cppflags "$($(tc-getPKG_CONFIG) --cflags libffi)" |
| 30 |
fi |
| 31 |
|
| 32 |
# llvm prefers clang over gcc, so we may need to force that |
| 33 |
|
| 34 |
diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild |
| 35 |
index 303f969..762055b 100644 |
| 36 |
--- a/sys-devel/llvm/llvm-3.5.2.ebuild |
| 37 |
+++ b/sys-devel/llvm/llvm-3.5.2.ebuild |
| 38 |
@@ -259,7 +259,7 @@ multilib_src_configure() { |
| 39 |
|
| 40 |
if use libffi; then |
| 41 |
local CPPFLAGS=${CPPFLAGS} |
| 42 |
- append-cppflags "$(pkg-config --cflags libffi)" |
| 43 |
+ append-cppflags "$($(tc-getPKG_CONFIG) --cflags libffi)" |
| 44 |
fi |
| 45 |
|
| 46 |
# llvm prefers clang over gcc, so we may need to force that |
| 47 |
|
| 48 |
diff --git a/sys-devel/llvm/llvm-3.6.2.ebuild b/sys-devel/llvm/llvm-3.6.2.ebuild |
| 49 |
index 5c2cbb2..9cd4302 100644 |
| 50 |
--- a/sys-devel/llvm/llvm-3.6.2.ebuild |
| 51 |
+++ b/sys-devel/llvm/llvm-3.6.2.ebuild |
| 52 |
@@ -266,7 +266,7 @@ multilib_src_configure() { |
| 53 |
|
| 54 |
if use libffi; then |
| 55 |
local CPPFLAGS=${CPPFLAGS} |
| 56 |
- append-cppflags "$(pkg-config --cflags libffi)" |
| 57 |
+ append-cppflags "$($(tc-getPKG_CONFIG) --cflags libffi)" |
| 58 |
fi |
| 59 |
|
| 60 |
# Enable large file support, bug #550708 |
| 61 |
|
| 62 |
diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild |
| 63 |
index af7dce6..ac91baf 100644 |
| 64 |
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild |
| 65 |
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild |
| 66 |
@@ -275,8 +275,8 @@ multilib_src_configure() { |
| 67 |
|
| 68 |
local ffi_cflags ffi_ldflags |
| 69 |
if use libffi; then |
| 70 |
- ffi_cflags=$(pkg-config --cflags-only-I libffi) |
| 71 |
- ffi_ldflags=$(pkg-config --libs-only-L libffi) |
| 72 |
+ ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) |
| 73 |
+ ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) |
| 74 |
fi |
| 75 |
|
| 76 |
local libdir=$(get_libdir) |
| 77 |
|
| 78 |
diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild |
| 79 |
index 439485f..53dd910 100644 |
| 80 |
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild |
| 81 |
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild |
| 82 |
@@ -280,8 +280,8 @@ multilib_src_configure() { |
| 83 |
|
| 84 |
local ffi_cflags ffi_ldflags |
| 85 |
if use libffi; then |
| 86 |
- ffi_cflags=$(pkg-config --cflags-only-I libffi) |
| 87 |
- ffi_ldflags=$(pkg-config --libs-only-L libffi) |
| 88 |
+ ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) |
| 89 |
+ ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) |
| 90 |
fi |
| 91 |
|
| 92 |
local libdir=$(get_libdir) |
| 93 |
|
| 94 |
diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild |
| 95 |
index de7426a..07d910b 100644 |
| 96 |
--- a/sys-devel/llvm/llvm-3.8.1.ebuild |
| 97 |
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild |
| 98 |
@@ -265,8 +265,8 @@ multilib_src_configure() { |
| 99 |
|
| 100 |
local ffi_cflags ffi_ldflags |
| 101 |
if use libffi; then |
| 102 |
- ffi_cflags=$(pkg-config --cflags-only-I libffi) |
| 103 |
- ffi_ldflags=$(pkg-config --libs-only-L libffi) |
| 104 |
+ ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) |
| 105 |
+ ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) |
| 106 |
fi |
| 107 |
|
| 108 |
local libdir=$(get_libdir) |
| 109 |
|
| 110 |
diff --git a/sys-devel/llvm/llvm-3.9.0-r1.ebuild b/sys-devel/llvm/llvm-3.9.0-r1.ebuild |
| 111 |
index 7faa108..23505b9 100644 |
| 112 |
--- a/sys-devel/llvm/llvm-3.9.0-r1.ebuild |
| 113 |
+++ b/sys-devel/llvm/llvm-3.9.0-r1.ebuild |
| 114 |
@@ -259,8 +259,8 @@ src_prepare() { |
| 115 |
multilib_src_configure() { |
| 116 |
local ffi_cflags ffi_ldflags |
| 117 |
if use libffi; then |
| 118 |
- ffi_cflags=$(pkg-config --cflags-only-I libffi) |
| 119 |
- ffi_ldflags=$(pkg-config --libs-only-L libffi) |
| 120 |
+ ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) |
| 121 |
+ ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) |
| 122 |
fi |
| 123 |
|
| 124 |
local libdir=$(get_libdir) |
| 125 |
|
| 126 |
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild |
| 127 |
index a89a1d2..94c3a7d 100644 |
| 128 |
--- a/sys-devel/llvm/llvm-9999.ebuild |
| 129 |
+++ b/sys-devel/llvm/llvm-9999.ebuild |
| 130 |
@@ -133,8 +133,8 @@ src_prepare() { |
| 131 |
multilib_src_configure() { |
| 132 |
local ffi_cflags ffi_ldflags |
| 133 |
if use libffi; then |
| 134 |
- ffi_cflags=$(pkg-config --cflags-only-I libffi) |
| 135 |
- ffi_ldflags=$(pkg-config --libs-only-L libffi) |
| 136 |
+ ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) |
| 137 |
+ ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) |
| 138 |
fi |
| 139 |
|
| 140 |
local libdir=$(get_libdir) |
Archives