[arch-commits] Commit in qhull/trunk (PKGBUILD)

[Eric Bélanger]

    Date: Saturday, November 17, 2012 @ 08:35:37
  Author: eric
Revision: 171420

upgpkg: qhull 2012.1-2

Compile with -fPIC (close FS#30010), Fix docs location (close FS#28619)

Modified:
  qhull/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-17 12:04:57 UTC (rev 171419)
+++ PKGBUILD	2012-11-17 13:35:37 UTC (rev 171420)
@@ -6,32 +6,35 @@
 
 pkgname=qhull
 pkgver=2012.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A general dimension code for computing convex hulls and related structures"
 arch=('i686' 'x86_64')
 url="http://www.qhull.org/"
 license=('custom')
 depends=('gcc-libs')
 makedepends=('cmake')
+options=('!libtool')
 source=("http://www.qhull.org/download/$pkgname-$pkgver-src.tgz")
-options=('!libtool')
-md5sums=('ed81aa19b203aa0fdb75b41fe6f7a40f')
+md5sums=('d0f978c0d8dfb2e919caefa56ea2953c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  if [ "${CARCH}" = "x86_64" ]; 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"
 }