diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-24 14:34:05 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-24 14:34:05 +0100 |
| commit | ee6ba8d4dcf31aa630641953009a27b3fd700faa (patch) | |
| tree | e0b23465af10683570926837a56ade01adc17307 /extra/qhull | |
| parent | d090dd0cd7b9488aebc92281720a0c5804950f32 (diff) | |
| parent | c65624e6d74bffd70dcd67cc28448b5a50596efb (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ecryptfs-utils/PKGBUILD
community/pylibacl/PKGBUILD
extra/kwebkitpart/PKGBUILD
extra/php/PKGBUILD
extra/qhull/PKGBUILD
kde-unstable/kdegames-kigo/PKGBUILD
kde-unstable/kdeutils-print-manager/PKGBUILD
Diffstat (limited to 'extra/qhull')
| -rw-r--r-- | extra/qhull/PKGBUILD | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/extra/qhull/PKGBUILD b/extra/qhull/PKGBUILD index 5c4c333a1..a8da5462e 100644 --- a/extra/qhull/PKGBUILD +++ b/extra/qhull/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150554 2012-02-18 13:03:41Z pierre $ +# $Id: PKGBUILD 171913 2012-11-23 13:37:18Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Jason Taylor <jftaylor21@gmail.com> @@ -6,32 +6,35 @@ pkgname=qhull pkgver=2012.1 -pkgrel=1.1 +pkgrel=2 pkgdesc="A general dimension code for computing convex hulls and related structures" arch=('i686' 'x86_64' 'mips64el') url="http://www.qhull.org/" license=('custom') depends=('gcc-libs') makedepends=('cmake') -source=("http://www.qhull.org/download/$pkgname-$pkgver-src.tgz") options=('!libtool') +source=("http://www.qhull.org/download/$pkgname-$pkgver-src.tgz") md5sums=('d0f978c0d8dfb2e919caefa56ea2953c') build() { cd "$srcdir/$pkgname-$pkgver" + if [ "${CARCH}" != "i686" ]; then + EXTRAOPTS="-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" + fi + mkdir srcbuild cd srcbuild - cmake -DCMAKE_INSTALL_PREFIX=/usr -DDOC_INSTALL_DIR=/usr/share/doc \ - -DMAN_INSTALL_DIR=/usr/share/man/man1 -DLIB_INSTALL_DIR=/usr/lib .. + cmake -DCMAKE_INSTALL_PREFIX=/usr $EXTRAOPTS .. make } package() { cd "$srcdir/$pkgname-$pkgver/srcbuild" - make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir" install # Install license - install -Dm644 $srcdir/$pkgname-$pkgver/COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/license.txt" + install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING.txt" "$pkgdir/usr/share/licenses/$pkgname/license.txt" } |