| 1 |
commit: f2c469d29e3609521229a0704dee4a1e27be1543 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 2 13:42:05 2012 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 2 13:42:05 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f2c469d2 |
| 7 |
|
| 8 |
[eclass] Use fully-qualified values for ar and ranlib, wrt bug #436070. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/cmake-utils.eclass | 4 +++- |
| 12 |
1 files changed, 3 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
| 15 |
index 2463bc5..77653ff 100644 |
| 16 |
--- a/eclass/cmake-utils.eclass |
| 17 |
+++ b/eclass/cmake-utils.eclass |
| 18 |
@@ -327,13 +327,15 @@ enable_cmake-utils_src_configure() { |
| 19 |
fi |
| 20 |
fi |
| 21 |
|
| 22 |
- # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS) |
| 23 |
+ # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.) |
| 24 |
local build_rules=${CMAKE_BUILD_DIR}/gentoo_rules.cmake |
| 25 |
cat > "${build_rules}" <<- _EOF_ |
| 26 |
+ SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE) |
| 27 |
SET (CMAKE_C_COMPILER $(type -P $(tc-getCC)) CACHE FILEPATH "C compiler" FORCE) |
| 28 |
SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) |
| 29 |
SET (CMAKE_CXX_COMPILER $(type -P $(tc-getCXX)) CACHE FILEPATH "C++ compiler" FORCE) |
| 30 |
SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) |
| 31 |
+ SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE) |
| 32 |
_EOF_ |
| 33 |
|
| 34 |
has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= |
Archives