[crux-commits] ports/contrib (3.5): yajl: updated cmake syntax

crux at crux.nu crux at crux.nu
Sat Jun 6 22:40:05 UTC 2020


commit 9ef656fa549b29d80e57f764801f1a672f61ff86
Author: Tim Biermann <tbier at posteo.de>
Date:   Sat Jun 6 22:31:25 2020 +0000

    yajl: updated cmake syntax

diff --git a/yajl/.footprint b/yajl/.footprint
index 7474e87bb..433ff75bb 100644
--- a/yajl/.footprint
+++ b/yajl/.footprint
@@ -4,11 +4,11 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/json_verify
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/yajl/
--rw-rw-r--	root/root	usr/include/yajl/yajl_common.h
--rw-rw-r--	root/root	usr/include/yajl/yajl_gen.h
--rw-rw-r--	root/root	usr/include/yajl/yajl_parse.h
--rw-rw-r--	root/root	usr/include/yajl/yajl_tree.h
--rw-rw-r--	root/root	usr/include/yajl/yajl_version.h
+-rw-r--r--	root/root	usr/include/yajl/yajl_common.h
+-rw-r--r--	root/root	usr/include/yajl/yajl_gen.h
+-rw-r--r--	root/root	usr/include/yajl/yajl_parse.h
+-rw-r--r--	root/root	usr/include/yajl/yajl_tree.h
+-rw-r--r--	root/root	usr/include/yajl/yajl_version.h
 drwxr-xr-x	root/root	usr/lib/
 lrwxrwxrwx	root/root	usr/lib/libyajl.so -> libyajl.so.2
 lrwxrwxrwx	root/root	usr/lib/libyajl.so.2 -> libyajl.so.2.1.0
@@ -16,4 +16,4 @@ lrwxrwxrwx	root/root	usr/lib/libyajl.so.2 -> libyajl.so.2.1.0
 -rw-r--r--	root/root	usr/lib/libyajl_s.a
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/pkgconfig/
--rw-rw-r--	root/root	usr/share/pkgconfig/yajl.pc
+-rw-r--r--	root/root	usr/share/pkgconfig/yajl.pc
diff --git a/yajl/.signature b/yajl/.signature
index 820fad170..3d7c3c0c8 100644
--- a/yajl/.signature
+++ b/yajl/.signature
@@ -1,5 +1,5 @@
-untrusted comment: verify with /etc/ports/tb.pub
-RWSXjYMPO7mZwMuO6Mjby+GNnAVYLggwtcAAym616KXETNaacipQzis/SwlrxnVePusOd3aOvS4tPxhoC5wADtOyfCDZVdfUYAA=
-SHA256 (Pkgfile) = 1e64e1ce95fb7c50172caad701efcbbb2d36f1da3691ad2f6595c477564138c0
-SHA256 (.footprint) = bbf70388c9f672fabc8b2084f688b856526ce8f0f3e1c6d0faefbb88372fbb1f
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF30ilAJCmUfcPko6R8VoV+lA1pThx0nXXyAO/ezKEpouRC1qaSomeSTsj8KZ4uFC7xaujVw0OMQctfCcM/Yhmvgw=
+SHA256 (Pkgfile) = 66560208b805dbffb0b5bb0c7a51d07d4e143512e0c903ab7aa944db6c11d555
+SHA256 (.footprint) = a12a3cd23e0ffa9ef413dd7d8d801472c0b67d9f53dae0d996713ea0eaca8686
 SHA256 (yajl-2.1.0.tar.gz) = 3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a
diff --git a/yajl/Pkgfile b/yajl/Pkgfile
index cf7e3f911..ba6621a56 100644
--- a/yajl/Pkgfile
+++ b/yajl/Pkgfile
@@ -9,11 +9,8 @@ release=1
 source=(https://github.com/lloyd/$name/archive/$version/$name-$version.tar.gz)
 
 build() {
-  cd $name-$version
-  mkdir build
-  cd build
-  cmake ..
-  make
-  install -d $PKG/usr
-  cp -a $name-$version/* $PKG/usr/
+  cmake -S$name-$version -Bbuild \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  cmake --build build
+  DESTDIR=$PKG cmake --build build --target install
 }


More information about the crux-commits mailing list