[arch-commits] Commit in qhull/trunk (PKGBUILD qhull-no-static.patch)

[Antonio Rojas]

    Date: Sunday, December 15, 2019 @ 09:53:57
  Author: arojas
Revision: 371502

Disable static libraries properly (FS#64844)

Added:
  qhull/trunk/qhull-no-static.patch
Modified:
  qhull/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |    9 +++++----
 qhull-no-static.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-15 04:40:44 UTC (rev 371501)
+++ PKGBUILD	2019-12-15 09:53:57 UTC (rev 371502)
@@ -15,9 +15,11 @@
 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-pic.patch::"https://github.com/qhull/qhull/commit/a5d0e644.patch"
+         qhull-no-static.patch)
 sha256sums=('2b7990558c363076261564f61b74db4d0d73b71869755108a469038c07dc43fb'
-            'edb77b3b949628eb6759920de8cd3216e179f8b54f16e357c0d4b5fe8bc06131')
+            'edb77b3b949628eb6759920de8cd3216e179f8b54f16e357c0d4b5fe8bc06131'
+            '8c9e7bda62da8f9c02429b0839610adf6e22525e0de6eb6df2a95cf3dad8b7ab')
 
 prepare() {
   mkdir -p build
@@ -24,6 +26,7 @@
 
   cd $pkgname-$pkgver
   patch -p1 -i ../qhull-pic.patch # Build libqhullcpp with PIC
+  patch -p1 -i ../qhull-no-static.patch # Disable static libraries
 }
 
 build() {
@@ -41,6 +44,4 @@
 
   # Install license
   install -Dm644 "$srcdir"/$pkgname-$pkgver/COPYING.txt -t "$pkgdir"/usr/share/licenses/$pkgname/
-  # Drop static libraries
-  rm "$pkgdir"/usr/lib/libqhullstatic*.a
 }

Added: qhull-no-static.patch
===================================================================
--- qhull-no-static.patch	                        (rev 0)
+++ qhull-no-static.patch	2019-12-15 09:53:57 UTC (rev 371502)
@@ -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