From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SOmXV-0007O7-PZ for garchives@archives.gentoo.org; Mon, 30 Apr 2012 09:05:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF692E0850; Mon, 30 Apr 2012 09:04:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C04D9E09B2 for ; Mon, 30 Apr 2012 09:04:54 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 309DC1B401A for ; Mon, 30 Apr 2012 09:04:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DE5D3E5403 for ; Mon, 30 Apr 2012 09:04:52 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1335776675.5ba010a35ad373030c8dfaffab1e8969660e3cf4.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/cmake/cmake-2.8.8.ebuild dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch X-VCS-Directories: dev-util/cmake/files/ dev-util/cmake/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 5ba010a35ad373030c8dfaffab1e8969660e3cf4 X-VCS-Branch: master Date: Mon, 30 Apr 2012 09:04:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 39f4246a-b517-4215-bab8-634d1945417c X-Archives-Hash: 9852cc78a8790c7870a7b2ae03e78c02 commit: 5ba010a35ad373030c8dfaffab1e8969660e3cf4 Author: Johannes Huber gentoo org> AuthorDate: Mon Apr 30 09:04:35 2012 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Apr 30 09:04:35 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D5ba010a3 [dev-util/cmake] Add patch for FindPkgConfig to respect PKG_CONFIG enviro= nment variable by DaboD gmail.com> bug 414037. (Portage version: 2.2.0_alpha101/git/Linux i686, unsigned Manifest commit= ) --- dev-util/cmake/cmake-2.8.8.ebuild | 1 + .../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 7f49779..c203b12 100644 --- a/dev-util/cmake/cmake-2.8.8.ebuild +++ b/dev-util/cmake/cmake-2.8.8.ebuild @@ -60,6 +60,7 @@ PATCHES=3D( "${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-u= til/cmake/files/cmake-2.8.8-FindPkgConfig.patch new file mode 100644 index 0000000..c5e17c5 --- /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) +=20 +-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config exe= cutable") ++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 e= xecutable") ++ endif(NOT PKG_CONFIG_EXECUTABLE) ++endif(NOT PKG_CONFIG_EXECUTABLE) + mark_as_advanced(PKG_CONFIG_EXECUTABLE) +=20 + if(PKG_CONFIG_EXECUTABLE)