| 1 |
commit: 66483a93354c105dd01ec5595e9ffdc870856de8 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 27 11:26:19 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 27 11:42:43 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66483a93 |
| 7 |
|
| 8 |
cmake-utils.eclass: Export PKG_CONFIG as envvar rather than build rule |
| 9 |
|
| 10 |
eclass/cmake-utils.eclass | 2 +- |
| 11 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
| 14 |
index 0528432..bf78cc3 100644 |
| 15 |
--- a/eclass/cmake-utils.eclass |
| 16 |
+++ b/eclass/cmake-utils.eclass |
| 17 |
@@ -521,7 +521,6 @@ enable_cmake-utils_src_configure() { |
| 18 |
SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) |
| 19 |
SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) |
| 20 |
SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE) |
| 21 |
- SET (PKG_CONFIG_EXECUTABLE $(type -P $(tc-getPKG_CONFIG)) CACHE FILEPATH "pkg-config executable" FORCE) |
| 22 |
_EOF_ |
| 23 |
|
| 24 |
local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake |
| 25 |
@@ -532,6 +531,7 @@ enable_cmake-utils_src_configure() { |
| 26 |
|
| 27 |
# Bug 542530, export those instead of setting paths in toolchain file |
| 28 |
local -x CC=$(tc-getCC) CXX=$(tc-getCXX) FC=$(tc-getFC) |
| 29 |
+ local -x PKG_CONFIG=$(tc-getPKG_CONFIG) |
| 30 |
|
| 31 |
if tc-is-cross-compiler; then |
| 32 |
local sysname |
Archives