| 1 |
commit: 5ba010a35ad373030c8dfaffab1e8969660e3cf4 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 30 09:04:35 2012 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 30 09:04:35 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5ba010a3 |
| 7 |
|
| 8 |
[dev-util/cmake] Add patch for FindPkgConfig to respect PKG_CONFIG environment variable by DaboD <daiderek <AT> gmail.com> bug 414037. |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha101/git/Linux i686, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
dev-util/cmake/cmake-2.8.8.ebuild | 1 + |
| 14 |
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 ++++++++++++++++++ |
| 15 |
2 files changed, 19 insertions(+), 0 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/cmake/cmake-2.8.8.ebuild b/dev-util/cmake/cmake-2.8.8.ebuild |
| 18 |
index 7f49779..c203b12 100644 |
| 19 |
--- a/dev-util/cmake/cmake-2.8.8.ebuild |
| 20 |
+++ b/dev-util/cmake/cmake-2.8.8.ebuild |
| 21 |
@@ -60,6 +60,7 @@ PATCHES=( |
| 22 |
"${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch |
| 23 |
"${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch |
| 24 |
"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch |
| 25 |
+ "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch |
| 26 |
"${FILESDIR}"/${PN}-2.8.8-more-no_host_paths.patch |
| 27 |
) |
| 28 |
cmake_src_bootstrap() { |
| 29 |
|
| 30 |
diff --git a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch |
| 31 |
new file mode 100644 |
| 32 |
index 0000000..c5e17c5 |
| 33 |
--- /dev/null |
| 34 |
+++ b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch |
| 35 |
@@ -0,0 +1,18 @@ |
| 36 |
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake |
| 37 |
+index c47f583..5783d37 100644 |
| 38 |
+--- a/Modules/FindPkgConfig.cmake |
| 39 |
++++ b/Modules/FindPkgConfig.cmake |
| 40 |
+@@ -87,7 +87,12 @@ |
| 41 |
+ set(PKG_CONFIG_VERSION 1) |
| 42 |
+ set(PKG_CONFIG_FOUND 0) |
| 43 |
+ |
| 44 |
+-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") |
| 45 |
++if(NOT PKG_CONFIG_EXECUTABLE) |
| 46 |
++ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG}) |
| 47 |
++ if(NOT PKG_CONFIG_EXECUTABLE) |
| 48 |
++ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") |
| 49 |
++ endif(NOT PKG_CONFIG_EXECUTABLE) |
| 50 |
++endif(NOT PKG_CONFIG_EXECUTABLE) |
| 51 |
+ mark_as_advanced(PKG_CONFIG_EXECUTABLE) |
| 52 |
+ |
| 53 |
+ if(PKG_CONFIG_EXECUTABLE) |
Archives