diff options
| author | piernov <piernov@piernov.org> | 2012-05-19 22:57:22 +0000 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2012-05-19 22:57:22 +0000 |
| commit | 735d77e9ffc2763c118e05828804bc792d724926 (patch) | |
| tree | e3208a8264b26b8014a5a449dbde9fb19ff7320d /cmake | |
| parent | d895271d8e14f05a72cc761e9e300672d58a6ae4 (diff) | |
| download | nutyx-extra-735d77e9ffc2763c118e05828804bc792d724926.tar.gz nutyx-extra-735d77e9ffc2763c118e05828804bc792d724926.tar.bz2 nutyx-extra-735d77e9ffc2763c118e05828804bc792d724926.tar.xz nutyx-extra-735d77e9ffc2763c118e05828804bc792d724926.zip | |
cmake 2.8.8-1 ajout patch pkg-config
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/.md5sum.i686 | 1 | ||||
| -rw-r--r-- | cmake/.md5sum.x86_64 | 1 | ||||
| -rwxr-xr-x | cmake/Pkgfile | 6 | ||||
| -rw-r--r-- | cmake/fix-pkg-config.patch | 31 |
4 files changed, 37 insertions, 2 deletions
diff --git a/cmake/.md5sum.i686 b/cmake/.md5sum.i686 index d4a3eb710..3c2257107 100644 --- a/cmake/.md5sum.i686 +++ b/cmake/.md5sum.i686 @@ -1 +1,2 @@ ba74b22c788a0c8547976b880cd02b17 cmake-2.8.8.tar.gz +469d56b412f8d6d1ea470e4e0396b29c fix-pkg-config.patch diff --git a/cmake/.md5sum.x86_64 b/cmake/.md5sum.x86_64 index d4a3eb710..3c2257107 100644 --- a/cmake/.md5sum.x86_64 +++ b/cmake/.md5sum.x86_64 @@ -1 +1,2 @@ ba74b22c788a0c8547976b880cd02b17 cmake-2.8.8.tar.gz +469d56b412f8d6d1ea470e4e0396b29c fix-pkg-config.patch diff --git a/cmake/Pkgfile b/cmake/Pkgfile index 9680aa7ec..196b1a056 100755 --- a/cmake/Pkgfile +++ b/cmake/Pkgfile @@ -8,14 +8,16 @@ name=cmake version=2.8.8 release=1 -source=(http://www.cmake.org/files/v2.8/$name-$version.tar.gz) +source=(http://www.cmake.org/files/v2.8/$name-$version.tar.gz + fix-pkg-config.patch) build() { cd $name-$version + patch -p1 < ../fix-pkg-config.patch ./bootstrap --prefix=/usr \ --mandir=/usr/share/man \ --system-libs \ - --parallel=2 + --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN) make make DESTDIR=$PKG install rm -rf $PKG/usr/doc diff --git a/cmake/fix-pkg-config.patch b/cmake/fix-pkg-config.patch new file mode 100644 index 000000000..aba3a6f9e --- /dev/null +++ b/cmake/fix-pkg-config.patch @@ -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 "") |