From 9b6a28286598c4d44b14dd3f269057330834b3b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 27 Nov 2016 11:52:23 +0100 Subject: [PATCH] sys-devel/llvm: Respect toolchain-funcs pkg-config override, #600622 --- sys-devel/llvm/llvm-3.4.2-r100.ebuild | 2 +- sys-devel/llvm/llvm-3.5.2.ebuild | 2 +- sys-devel/llvm/llvm-3.6.2.ebuild | 2 +- sys-devel/llvm/llvm-3.7.1-r3.ebuild | 4 ++-- sys-devel/llvm/llvm-3.8.1-r2.ebuild | 4 ++-- sys-devel/llvm/llvm-3.8.1.ebuild | 4 ++-- sys-devel/llvm/llvm-3.9.0-r1.ebuild | 4 ++-- sys-devel/llvm/llvm-9999.ebuild | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys-devel/llvm/llvm-3.4.2-r100.ebuild b/sys-devel/llvm/llvm-3.4.2-r100.ebuild index 97394372a2dd..56a9d131e6e0 100644 --- a/sys-devel/llvm/llvm-3.4.2-r100.ebuild +++ b/sys-devel/llvm/llvm-3.4.2-r100.ebuild @@ -174,7 +174,7 @@ multilib_src_configure() { if use libffi; then local CPPFLAGS=${CPPFLAGS} - append-cppflags "$(pkg-config --cflags libffi)" + append-cppflags "$($(tc-getPKG_CONFIG) --cflags libffi)" fi # llvm prefers clang over gcc, so we may need to force that diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild index 303f969e9252..762055be933a 100644 --- a/sys-devel/llvm/llvm-3.5.2.ebuild +++ b/sys-devel/llvm/llvm-3.5.2.ebuild @@ -259,7 +259,7 @@ multilib_src_configure() { if use libffi; then local CPPFLAGS=${CPPFLAGS} - append-cppflags "$(pkg-config --cflags libffi)" + append-cppflags "$($(tc-getPKG_CONFIG) --cflags libffi)" fi # llvm prefers clang over gcc, so we may need to force that diff --git a/sys-devel/llvm/llvm-3.6.2.ebuild b/sys-devel/llvm/llvm-3.6.2.ebuild index 5c2cbb215b7c..9cd430212f19 100644 --- a/sys-devel/llvm/llvm-3.6.2.ebuild +++ b/sys-devel/llvm/llvm-3.6.2.ebuild @@ -266,7 +266,7 @@ multilib_src_configure() { if use libffi; then local CPPFLAGS=${CPPFLAGS} - append-cppflags "$(pkg-config --cflags libffi)" + append-cppflags "$($(tc-getPKG_CONFIG) --cflags libffi)" fi # Enable large file support, bug #550708 diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild index af7dce673333..ac91baf3d437 100644 --- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild +++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild @@ -275,8 +275,8 @@ multilib_src_configure() { local ffi_cflags ffi_ldflags if use libffi; then - ffi_cflags=$(pkg-config --cflags-only-I libffi) - ffi_ldflags=$(pkg-config --libs-only-L libffi) + ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) + ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) fi local libdir=$(get_libdir) diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild index 439485f9cb71..53dd9100947c 100644 --- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild +++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild @@ -280,8 +280,8 @@ multilib_src_configure() { local ffi_cflags ffi_ldflags if use libffi; then - ffi_cflags=$(pkg-config --cflags-only-I libffi) - ffi_ldflags=$(pkg-config --libs-only-L libffi) + ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) + ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) fi local libdir=$(get_libdir) diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild index de7426a24fcc..07d910bf3ef0 100644 --- a/sys-devel/llvm/llvm-3.8.1.ebuild +++ b/sys-devel/llvm/llvm-3.8.1.ebuild @@ -265,8 +265,8 @@ multilib_src_configure() { local ffi_cflags ffi_ldflags if use libffi; then - ffi_cflags=$(pkg-config --cflags-only-I libffi) - ffi_ldflags=$(pkg-config --libs-only-L libffi) + ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) + ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) fi local libdir=$(get_libdir) diff --git a/sys-devel/llvm/llvm-3.9.0-r1.ebuild b/sys-devel/llvm/llvm-3.9.0-r1.ebuild index 7faa108802b4..23505b9587db 100644 --- a/sys-devel/llvm/llvm-3.9.0-r1.ebuild +++ b/sys-devel/llvm/llvm-3.9.0-r1.ebuild @@ -259,8 +259,8 @@ src_prepare() { multilib_src_configure() { local ffi_cflags ffi_ldflags if use libffi; then - ffi_cflags=$(pkg-config --cflags-only-I libffi) - ffi_ldflags=$(pkg-config --libs-only-L libffi) + ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) + ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) fi local libdir=$(get_libdir) diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild index a89a1d219826..94c3a7d6e596 100644 --- a/sys-devel/llvm/llvm-9999.ebuild +++ b/sys-devel/llvm/llvm-9999.ebuild @@ -133,8 +133,8 @@ src_prepare() { multilib_src_configure() { local ffi_cflags ffi_ldflags if use libffi; then - ffi_cflags=$(pkg-config --cflags-only-I libffi) - ffi_ldflags=$(pkg-config --libs-only-L libffi) + ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) + ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) fi local libdir=$(get_libdir) -- 2.26.2