[crux-commits] ports/opt (3.6): mariadb: update cmake syntax

crux at crux.nu crux at crux.nu
Wed Jul 22 11:53:46 UTC 2020


commit bfbcbe9e369ad38351f613926ecf9d323e7ec928
Author: Juergen Daubert <jue at jue.li>
Date:   Mon Jul 20 13:12:25 2020 +0200

    mariadb: update cmake syntax

diff --git a/mariadb/.signature b/mariadb/.signature
index 782920a5d..3d27bca70 100644
--- a/mariadb/.signature
+++ b/mariadb/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/a4w9g7JPWcWFlRoTebFwqmKvHVbYWGEZHH/GCIOrxXWx17pyTiUIA3BTZX/X2kVDPLmD7QfASMfuRo1dhXDTA8=
-SHA256 (Pkgfile) = b477436097e72a4c5394e2b850af9f87802c9844c8b6449ebbe7cb618aaaee99
+RWSE3ohX2g5d/TbPBOkt9YujB8HljQL8A7m6y6A+GEb0gxY+jGjdukd32PeQoWmBW/pE+yLUu15PYmt+nvDEImNZhq5lV14q+gc=
+SHA256 (Pkgfile) = 13b3fe3b28267deb8d401814e863382e296266395f420b77649ac0c4a0514693
 SHA256 (.footprint) = e4cc5cc9a6797e0efd1a647cd967fc51579859f99457c7407a5ecdbacc951fb4
 SHA256 (mariadb-10.5.4.tar.gz) = 26db2becc9cec37e99a4e73390bd2eaa74568e21f9cf110359f4f68b37154c72
 SHA256 (mariadb.rc) = 737fe0eaad407e2b078ba21c1e4082dc4361da10354939ed4f6da651a76a8c1f
diff --git a/mariadb/Pkgfile b/mariadb/Pkgfile
index 9bc2b8c1d..ab51d3afb 100644
--- a/mariadb/Pkgfile
+++ b/mariadb/Pkgfile
@@ -11,12 +11,7 @@ source=(https://downloads.mariadb.com/MariaDB//$name-$version/source/$name-$vers
         pre-install)
 
 build() {
-
-	cd $name-$version
-
-	mkdir build && cd build
-
-	cmake .. \
+	cmake -S $name-$version -B build \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DINSTALL_LAYOUT=RPM \
 		-DINSTALL_LIBDIR=lib \
@@ -33,8 +28,8 @@ build() {
 		-DWITH_UNIT_TESTS=OFF \
 		-DSKIP_TESTS=ON
 
-	make
-	make DESTDIR=$PKG install
+	cmake --build build
+	DESTDIR=$PKG cmake --install build
 
 	rm -r $PKG/etc/{init.d,logrotate.d}
 	rm -r $PKG/usr/share/{doc,groonga*,mysql-test}


More information about the crux-commits mailing list