mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-10 10:44:37 +08:00
cmake update
This commit is contained in:
parent
1615d77d70
commit
9a0a68a4ae
@ -1,10 +1,7 @@
|
|||||||
#
|
|
||||||
# Core Packages for Chakra, part of chakra-project.org
|
|
||||||
#
|
|
||||||
# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||||
|
|
||||||
pkgname=cmake
|
pkgname=cmake
|
||||||
pkgver=2.8.9
|
pkgver=2.8.10.2
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="A cross-platform open-source make system"
|
pkgdesc="A cross-platform open-source make system"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
@ -13,16 +10,12 @@ url="http://www.cmake.org"
|
|||||||
depends=('curl' 'libarchive' 'shared-mime-info')
|
depends=('curl' 'libarchive' 'shared-mime-info')
|
||||||
makedepends=('qt')
|
makedepends=('qt')
|
||||||
install=${pkgname}.install
|
install=${pkgname}.install
|
||||||
source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
|
source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
|
||||||
'fix-pkg-config.patch')
|
md5sums=('097278785da7182ec0aea8769d06860c')
|
||||||
md5sums=('801f4c87f8b604f727df5bf1f05a59e7'
|
|
||||||
'1d0e7fddd703a36df30262d7616a59be')
|
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "${srcdir}"/${pkgname}-${pkgver}
|
cd "${srcdir}"/${pkgname}-${pkgver}
|
||||||
|
|
||||||
#patch -p1 -i "${srcdir}"/fix-pkg-config.patch
|
|
||||||
|
|
||||||
./bootstrap --prefix=/usr \
|
./bootstrap --prefix=/usr \
|
||||||
--mandir=/share/man \
|
--mandir=/share/man \
|
||||||
--docdir=/share/doc/cmake \
|
--docdir=/share/doc/cmake \
|
||||||
|
@ -1,32 +0,0 @@
|
|||||||
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 "")
|
|
@ -1,6 +1,5 @@
|
|||||||
# Maintainer: abveritas@chakra-project.org>
|
# Maintainer: abveritas@chakra-project.org>
|
||||||
|
|
||||||
|
|
||||||
pkgname=make
|
pkgname=make
|
||||||
pkgver=3.82
|
pkgver=3.82
|
||||||
pkgrel=2
|
pkgrel=2
|
||||||
|
Loading…
Reference in New Issue
Block a user