diff options
Diffstat (limited to 'dev-util/cmake')
| -rw-r--r-- | dev-util/cmake/cmake-2.8.8.ebuild | 1 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/dev-util/cmake/cmake-2.8.8.ebuild b/dev-util/cmake/cmake-2.8.8.ebuild index 7f49779ea42..c203b122184 100644 --- a/dev-util/cmake/cmake-2.8.8.ebuild +++ b/dev-util/cmake/cmake-2.8.8.ebuild @@ -60,6 +60,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch "${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch + "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch "${FILESDIR}"/${PN}-2.8.8-more-no_host_paths.patch ) cmake_src_bootstrap() { diff --git a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch new file mode 100644 index 00000000000..c5e17c5ba64 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch @@ -0,0 +1,18 @@ +diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake +index c47f583..5783d37 100644 +--- a/Modules/FindPkgConfig.cmake ++++ b/Modules/FindPkgConfig.cmake +@@ -87,7 +87,12 @@ + set(PKG_CONFIG_VERSION 1) + set(PKG_CONFIG_FOUND 0) + +-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") ++if(NOT PKG_CONFIG_EXECUTABLE) ++ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG}) ++ if(NOT PKG_CONFIG_EXECUTABLE) ++ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") ++ endif(NOT PKG_CONFIG_EXECUTABLE) ++endif(NOT PKG_CONFIG_EXECUTABLE) + mark_as_advanced(PKG_CONFIG_EXECUTABLE) + + if(PKG_CONFIG_EXECUTABLE) |