[arch-commits] Commit in cmake/trunk (PKGBUILD fix-pkg-config.patch)

Andrea Scarpino andrea at archlinux.org
Wed Apr 25 02:58:02 EDT 2012


    Date: Wednesday, April 25, 2012 @ 02:58:02
  Author: andrea
Revision: 157164

upgpkg: cmake 2.8.8-2

Fix PKG_CONFIG_FOUND variable not set (FS#29545)

Added:
  cmake/trunk/fix-pkg-config.patch
Modified:
  cmake/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   11 ++++++++---
 fix-pkg-config.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-25 06:28:02 UTC (rev 157163)
+++ PKGBUILD	2012-04-25 06:58:02 UTC (rev 157164)
@@ -4,7 +4,7 @@
 
 pkgname=cmake
 pkgver=2.8.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/"
@@ -13,12 +13,17 @@
 makedepends=('qt')
 optdepends=('qt: cmake-gui')
 install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ba74b22c788a0c8547976b880cd02b17')
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
+        'fix-pkg-config.patch')
+md5sums=('ba74b22c788a0c8547976b880cd02b17'
+         '32c6a4360a2ba12dc77b6a840fa7672b')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
+  # FS#29545
+  patch -p1 -i "${srcdir}"/fix-pkg-config.patch
+
   ./bootstrap --prefix=/usr \
     --mandir=/share/man \
     --docdir=/share/doc/cmake \

Added: fix-pkg-config.patch
===================================================================
--- fix-pkg-config.patch	                        (rev 0)
+++ fix-pkg-config.patch	2012-04-25 06:58:02 UTC (rev 157164)
@@ -0,0 +1,31 @@
+X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindPkgConfig.cmake;h=39d3a76abd852df4a32eab5f8d5672fa24a7e4cf;hp=5d93ab151de792b4565cbef1927f372be633f4a6;hb=3ea850a5023060b84dcc0e6f0098c32c28b15807;hpb=ad3d2b450f1c2454cd1a3f416ef97631e2937eef
+
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index 5d93ab1..39d3a76 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -13,11 +13,10 @@
+ # When the 'QUIET' argument is set, no status messages will be printed.
+ #
+ # It sets the following variables:
+-#   PKG_CONFIG_FOUND          ... true if pkg-config works on the system
++#   PKG_CONFIG_FOUND          ... if pkg-config executable was found
+ #   PKG_CONFIG_EXECUTABLE     ... pathname of the pkg-config program
+ #   PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
+ #                                 (since CMake 2.8.8)
+-#   PKG_CONFIG_FOUND          ... if pkg-config executable was found
+ #
+ # For the following variables two sets of values exist; first one is the
+ # common one and has the given PREFIX. The second set contains flags
+@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig
+                                   REQUIRED_VARS PKG_CONFIG_EXECUTABLE
+                                   VERSION_VAR PKG_CONFIG_VERSION_STRING)
+ 
++# This is needed because the module name is "PkgConfig" but the name of
++# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
++# handled by FPHSA.
++set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
++
+ # Unsets the given variables
+ macro(_pkgconfig_unset var)
+   set(${var} "" CACHE INTERNAL "")



More information about the arch-commits mailing list