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

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


commit f7480d70fececc638274e5d191785aff1c4f49ce
Author: Juergen Daubert <jue at jue.li>
Date:   Mon Jul 20 13:23:17 2020 +0200

    mysql: update cmake syntax

diff --git a/mysql/.signature b/mysql/.signature
index 7248a1d0e..6f7ffbde9 100644
--- a/mysql/.signature
+++ b/mysql/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/X/GR9UcrJneECgpEmMIgUllej9CK7HL0sAk+8WKEzgSvDF8DS6QJrVPzvBQnWe8nQVB05rKPVK7ZZ2A1AiuowU=
-SHA256 (Pkgfile) = b91c536b7a27c0adba0252ba89bcd7818b92405f7ea3723d180bdbece49a3e2d
+RWSE3ohX2g5d/a+emwXRlLEscCthJ9XDXBvoFVzGOl4FRo5rr7OJf/gxNgfeHrrvSclMGO6vYRzImbXpT2BH5vUw1JAZ9k6I5Q4=
+SHA256 (Pkgfile) = 09fc7589b727b054e07f02177ebd70beaf2a954e9347f0d97833ac52b527dd17
 SHA256 (.footprint) = 69c4ca33512ce641f1f073263079256a661d6915d9f545a08025fe0c330f3bdd
 SHA256 (mysql-boost-5.7.31.tar.gz) = 85bd222e61846313d7ad7c095ad664c89ca8f52dd9c21b7ac343ead62d701200
 SHA256 (my.cnf) = 51d46fe239e1e18a608e64ea1242fda946c2ea5a9ecea4507d89734e263ab828
diff --git a/mysql/Pkgfile b/mysql/Pkgfile
index 1e6d6a29d..ad5c71455 100644
--- a/mysql/Pkgfile
+++ b/mysql/Pkgfile
@@ -10,9 +10,7 @@ source=(https://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.7/$name-boost-$vers
         my.cnf mysqld)
 
 build () {
-    cd $name-$version
-
-    cmake . \
+    cmake -S $name-$version -B build \
         -DBUILD_CONFIG=mysql_release \
         -DINSTALL_LAYOUT=RPM \
         -DCMAKE_INSTALL_PREFIX=/usr \
@@ -21,13 +19,13 @@ build () {
         -DINSTALL_PLUGINDIR=lib/mysql/plugin \
         -DINSTALL_MANDIR=share/man \
         -DINSTALL_SECURE_PRIVDIR=/var/lib/mysql-files \
-        -DWITH_BOOST=./boost \
+        -DWITH_BOOST=$name-$version/boost \
         -DWITH_LIBWRAP=0 \
         -DWITH_SSL=system \
         -DWITH_ZLIB=system
 
-    make
-    make DESTDIR=$PKG install
+    cmake --build build
+    DESTDIR=$PKG cmake --install build
 
     rm -r $PKG/usr/share/{mysql-test,info}
     rm $PKG/usr/share/mysql/charsets/README


More information about the crux-commits mailing list