[arch-commits] Commit in qhull/repos/extra-x86_64 (3 files)

[Antonio Rojas]

    Date: Sunday, December 15, 2019 @ 09:54:17
  Author: arojas
Revision: 371503

archrelease: copy trunk to extra-x86_64

Added:
  qhull/repos/extra-x86_64/PKGBUILD
    (from rev 371502, qhull/trunk/PKGBUILD)
  qhull/repos/extra-x86_64/qhull-no-static.patch
    (from rev 371502, qhull/trunk/qhull-no-static.patch)
Deleted:
  qhull/repos/extra-x86_64/PKGBUILD

-----------------------+
 PKGBUILD              |   93 ++++++++++++++++++++++++------------------------
 qhull-no-static.patch |   42 +++++++++++++++++++++
 2 files changed, 89 insertions(+), 46 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-15 09:53:57 UTC (rev 371502)
+++ PKGBUILD	2019-12-15 09:54:17 UTC (rev 371503)
@@ -1,46 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Ronald van Haren <ronald at archlinux.org>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: Jason Taylor <jftaylor21 at gmail.com>
-# Contributor: Darwin Bautista <djclue917 at gmail.com>
-
-pkgname=qhull
-pkgver=2019.1
-_pkgver=7.3.2
-pkgrel=2
-pkgdesc="A general dimension code for computing convex hulls and related structures"
-arch=(x86_64)
-url="http://www.qhull.org/"
-license=(custom)
-depends=(glibc)
-makedepends=(cmake)
-source=("http://www.qhull.org/download/qhull-2019-src-$_pkgver.tgz"
-         qhull-pic.patch::"https://github.com/qhull/qhull/commit/a5d0e644.patch")
-sha256sums=('2b7990558c363076261564f61b74db4d0d73b71869755108a469038c07dc43fb'
-            'edb77b3b949628eb6759920de8cd3216e179f8b54f16e357c0d4b5fe8bc06131')
-
-prepare() {
-  mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../qhull-pic.patch # Build libqhullcpp with PIC
-}
-
-build() {
-  cd build
-
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() { 
-  cd build
-
-  make DESTDIR="$pkgdir" install
-
-  # Install license
-  install -Dm644 "$srcdir"/$pkgname-$pkgver/COPYING.txt -t "$pkgdir"/usr/share/licenses/$pkgname/
-  # Drop static libraries
-  rm "$pkgdir"/usr/lib/libqhullstatic*.a
-}

Copied: qhull/repos/extra-x86_64/PKGBUILD (from rev 371502, qhull/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-12-15 09:54:17 UTC (rev 371503)
@@ -0,0 +1,47 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Ronald van Haren <ronald at archlinux.org>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Jason Taylor <jftaylor21 at gmail.com>
+# Contributor: Darwin Bautista <djclue917 at gmail.com>
+
+pkgname=qhull
+pkgver=2019.1
+_pkgver=7.3.2
+pkgrel=2
+pkgdesc="A general dimension code for computing convex hulls and related structures"
+arch=(x86_64)
+url="http://www.qhull.org/"
+license=(custom)
+depends=(glibc)
+makedepends=(cmake)
+source=("http://www.qhull.org/download/qhull-2019-src-$_pkgver.tgz"
+         qhull-pic.patch::"https://github.com/qhull/qhull/commit/a5d0e644.patch"
+         qhull-no-static.patch)
+sha256sums=('2b7990558c363076261564f61b74db4d0d73b71869755108a469038c07dc43fb'
+            'edb77b3b949628eb6759920de8cd3216e179f8b54f16e357c0d4b5fe8bc06131'
+            '8c9e7bda62da8f9c02429b0839610adf6e22525e0de6eb6df2a95cf3dad8b7ab')
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../qhull-pic.patch # Build libqhullcpp with PIC
+  patch -p1 -i ../qhull-no-static.patch # Disable static libraries
+}
+
+build() {
+  cd build
+
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() { 
+  cd build
+
+  make DESTDIR="$pkgdir" install
+
+  # Install license
+  install -Dm644 "$srcdir"/$pkgname-$pkgver/COPYING.txt -t "$pkgdir"/usr/share/licenses/$pkgname/
+}

Copied: qhull/repos/extra-x86_64/qhull-no-static.patch (from rev 371502, qhull/trunk/qhull-no-static.patch)
===================================================================
--- qhull-no-static.patch	                        (rev 0)
+++ qhull-no-static.patch	2019-12-15 09:54:17 UTC (rev 371503)
@@ -0,0 +1,42 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 09aa249..f1f4b50 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -353,7 +353,7 @@ endif()
+ 
+ set(
+     qhull_TARGETS_INSTALL
+-        ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICR} ${qhull_SHAREDR}
++        ${qhull_CPP} ${qhull_SHAREDR}
+         qhull rbox qconvex qdelaunay qvoronoi qhalf
+         ${qhull_SHARED} ${qhull_SHAREDP}  # Deprecated, use qhull_r instead
+ )
+@@ -485,22 +485,22 @@ set(qvoronoi_SOURCES    src/qvoronoi/qvoronoi.c)
+ set(qhalf_SOURCES       src/qhalf/qhalf.c)
+ 
+ add_executable(qhull ${qhull_SOURCES})
+-target_link_libraries(qhull ${qhull_STATICR})
++target_link_libraries(qhull ${qhull_SHAREDR})
+ 
+ add_executable(rbox ${rbox_SOURCES})
+-target_link_libraries(rbox ${qhull_STATIC})
++target_link_libraries(rbox ${qhull_SHARED})
+ 
+ add_executable(qconvex ${qconvex_SOURCES})
+-target_link_libraries(qconvex ${qhull_STATIC})
++target_link_libraries(qconvex ${qhull_SHARED})
+ 
+ add_executable(qdelaunay ${qdelaunay_SOURCES})
+-target_link_libraries(qdelaunay ${qhull_STATIC})
++target_link_libraries(qdelaunay ${qhull_SHARED})
+ 
+ add_executable(qvoronoi ${qvoronoi_SOURCES})
+-target_link_libraries(qvoronoi ${qhull_STATIC})
++target_link_libraries(qvoronoi ${qhull_SHARED})
+ 
+ add_executable(qhalf ${qhalf_SOURCES})
+-target_link_libraries(qhalf ${qhull_STATIC})
++target_link_libraries(qhalf ${qhull_SHARED})
+ 
+ # ---------------------------------------
+ # Define options for linking to qhull_SHAREDR or qhull_SHARED