[arch-commits] Commit in bliss/trunk (PKGBUILD make-install.patch)

[Antonio Rojas]

    Date: Sunday, December 26, 2021 @ 13:22:35
  Author: arojas
Revision: 1083846

Turn gmp off as it causes segfaults, implement make install

Added:
  bliss/trunk/make-install.patch
Modified:
  bliss/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   17 ++++++++---------
 make-install.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-26 10:49:14 UTC (rev 1083845)
+++ PKGBUILD	2021-12-26 13:22:35 UTC (rev 1083846)
@@ -2,7 +2,7 @@
 
 pkgname=bliss
 pkgver=0.77
-pkgrel=1
+pkgrel=2
 pkgdesc='A library for computing automorphism groups and canonical forms of graphs'
 arch=(x86_64)
 url='https://users.aalto.fi/~tjunttil/bliss/'
@@ -10,25 +10,24 @@
 depends=(gmp)
 makedepends=(cmake)
 source=(https://users.aalto.fi/~tjunttil/bliss/downloads/$pkgname-$pkgver.zip
-        digraph_heuristic.patch)
+        digraph_heuristic.patch
+        make-install.patch)
 sha256sums=('acc8b98034f30fad24c897f365abd866c13d9f1bb207e398d0caf136875972a4'
-            '584dbb948c5ad39c32373a3736d457ef5ecf0c23b552d9e925fa0ace61652461')
+            '584dbb948c5ad39c32373a3736d457ef5ecf0c23b552d9e925fa0ace61652461'
+            '1cbbcf33c779c832787ad2b6770643b2a3f9ddbe2077217820fe5ac5ca902f16')
 
 prepare() {
   patch -d $pkgname-$pkgver -p1 < digraph_heuristic.patch # Fix splitting heuristics for digraphs
+  patch -d $pkgname-$pkgver -p1 < make-install.patch # Add make install target
 }
 
 build() {
   cmake -B build -S bliss-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DUSE_GMP=ON
+    -DUSE_GMP=OFF
   cmake --build build
 }
 
 package() {
-   install -Dm644 $pkgname-$pkgver/src/*.hh -t "$pkgdir"/usr/include/bliss/
-   install -Dm755 build/libbliss.so -t "$pkgdir"/usr/lib/
-   install -Dm755 build/bliss -t "$pkgdir"/usr/bin/
-
-#  DESTDIR="$pkgdir" cmake --install build
+  DESTDIR="$pkgdir" cmake --install build
 }

Added: make-install.patch
===================================================================
--- make-install.patch	                        (rev 0)
+++ make-install.patch	2021-12-26 13:22:35 UTC (rev 1083846)
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 01ed093..9d3085d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,3 +62,27 @@ if(USE_GMP)
+   target_link_libraries(bliss-executable ${GMP_LIBRARIES})
+ endif(USE_GMP)
+ set_target_properties(bliss-executable PROPERTIES OUTPUT_NAME bliss)
++
++include(GNUInstallDirs)
++
++set(
++  BLISS_HEADERS
++  src/bliss_C.h
++  src/uintseqhash.hh
++  src/abstractgraph.hh
++  src/stats.hh
++  src/digraph.hh
++  src/defs.hh
++  src/heap.hh
++  src/graph.hh
++  src/partition.hh
++  src/kqueue.hh
++  src/utils.hh
++  src/orbit.hh
++  src/timer.hh
++  src/bignum.hh
++)
++
++install(TARGETS bliss-executable RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++install(TARGETS bliss LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(FILES ${BLISS_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bliss)