This commit is contained in:
Manuel 2012-06-11 21:24:03 +00:00
parent 7a5d604b7b
commit 44d689205e
5 changed files with 49 additions and 19 deletions

View File

@ -1,13 +1,11 @@
#
# Core Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=cmake
pkgver=2.8.7
pkgrel=2
pkgver=2.8.8
pkgrel=1
pkgdesc="A cross-platform open-source make system"
arch=('i686' 'x86_64')
license=('custom')
@ -15,18 +13,22 @@ url="http://www.cmake.org"
depends=('curl' 'libarchive' 'shared-mime-info')
makedepends=('qt')
install=${pkgname}.install
source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
md5sums=('e1b237aeaed880f65dec9c20602452f6')
source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
'fix-pkg-config.patch')
md5sums=('ba74b22c788a0c8547976b880cd02b17'
'1d0e7fddd703a36df30262d7616a59be')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
patch -p1 -i "${srcdir}"/fix-pkg-config.patch
./bootstrap --prefix=/usr \
--mandir=/share/man \
--docdir=/share/doc/cmake \
--system-libs \
--qt-gui \
--parallel=2
--parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
make
}
@ -38,5 +40,6 @@ package() {
install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim
install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim
install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el
install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}

View File

@ -1,5 +1,6 @@
post_install() {
update-mime-database usr/share/mime &> /dev/null
[[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
}
post_upgrade() {

View File

@ -0,0 +1,32 @@
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 "")

View File

@ -8,7 +8,7 @@ pkgname=linux-firmware
pkgver=20120227
_b43=4.178.10.4
_legacy=3.130.20.0
pkgrel=2
pkgrel=3
pkgdesc="Firmware files for Linux"
arch=('any')
url="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary"
@ -75,10 +75,4 @@ package() {
# install b43-legacy-firmware
b43-fwcutter -w "${pkgdir}/usr/lib/firmware/" ${srcdir}/wl_apsta-${_legacy}.o
# Keep compatibility with old initscripts
install -d -m755 "${pkgdir}/lib"
pushd $pkgdir/lib
ln -sv ../usr/lib/firmware/ .
popd
}

View File

@ -5,7 +5,7 @@
pkgname=udev
pkgver=182
pkgrel=1
pkgrel=2
pkgdesc="The userspace dev tools (udev)"
depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'acl')
install=udev.install
@ -30,7 +30,7 @@ build() {
--with-rootprefix= \
--sysconfdir=/etc \
--libdir=/usr/lib \
--libexecdir=/lib \
--libexecdir=/usr/lib \
--with-systemdsystemunitdir=/lib/systemd/system \
--enable-udev_acl
@ -56,7 +56,7 @@ package() {
done
# install the mkinitpcio hook
install -D -m644 ../initcpio-hooks-udev ${pkgdir}/lib/initcpio/hooks/udev
install -D -m644 ../initcpio-install-udev ${pkgdir}/lib/initcpio/install/udev
install -D -m644 ../initcpio-hooks-udev ${pkgdir}/usr/lib/initcpio/hooks/udev
install -D -m644 ../initcpio-install-udev ${pkgdir}/usr/lib/initcpio/install/udev
}