summaryrefslogtreecommitdiffstats
path: root/source/ap
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-04-03 18:28:05 +0000
committer Eric Hameleers <alien@slackware.com>2021-04-04 08:59:49 +0200
commit2fa8690488a46236661e058ebceb0cde13755f23 (patch)
tree47ce01821996fe5e62d50c1f234f62005c798b79 /source/ap
parent26d39dbef39d88ebd68227d8e9f183d89a19c58e (diff)
downloadcurrent-2fa8690488a46236661e058ebceb0cde13755f23.tar.gz
current-2fa8690488a46236661e058ebceb0cde13755f23.tar.xz
Sat Apr 3 18:28:05 UTC 202120210403182805
ap/sqlite-3.35.4-x86_64-1.txz: Upgraded. d/python3-3.9.3-x86_64-1.txz: Upgraded. l/opencv-4.5.2-x86_64-1.txz: Upgraded. l/python-docutils-0.17-x86_64-1.txz: Upgraded. n/bluez-5.58-x86_64-1.txz: Upgraded. xfce/mousepad-0.5.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap')
-rw-r--r--source/ap/FTBFSlog3
-rw-r--r--source/ap/mariadb/mariadb.ConnectorName.cmake.diff12
-rwxr-xr-xsource/ap/mariadb/mariadb.SlackBuild3
3 files changed, 18 insertions, 0 deletions
diff --git a/source/ap/FTBFSlog b/source/ap/FTBFSlog
index 23a464f7d..13a5bbcfc 100644
--- a/source/ap/FTBFSlog
+++ b/source/ap/FTBFSlog
@@ -1,3 +1,6 @@
+Sat Apr 3 17:43:44 UTC 2021
+ mariadb: Fix a CMake syntax error. Thanks to nobodino.
++--------------------------+
Sun Jan 17 20:00:47 UTC 2021
bpe: port from sys_errlist to strerror.
+--------------------------+
diff --git a/source/ap/mariadb/mariadb.ConnectorName.cmake.diff b/source/ap/mariadb/mariadb.ConnectorName.cmake.diff
new file mode 100644
index 000000000..75da7d993
--- /dev/null
+++ b/source/ap/mariadb/mariadb.ConnectorName.cmake.diff
@@ -0,0 +1,12 @@
+diff -u -r --new-file mariadb-10.5.9.orig/libmariadb/cmake/ConnectorName.cmake mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake
+--- mariadb-10.5.9.orig/libmariadb/cmake/ConnectorName.cmake 2021-02-16 08:50:36.000000000 -0600
++++ mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake 2021-04-03 12:41:14.858993480 -0500
+@@ -22,7 +22,7 @@
+ SET(MACHINE_NAME "x64")
+ ELSE()
+ SET(MACHINE_NAME "32")
+- END()
++ ENDIF()
+ ENDIF()
+
+ SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild
index 2291bb573..d9b02aac1 100755
--- a/source/ap/mariadb/mariadb.SlackBuild
+++ b/source/ap/mariadb/mariadb.SlackBuild
@@ -97,6 +97,9 @@ if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
zcat $CWD/mysql.no.plugin_auth_pam.diff.gz | patch -p1 --verbose || exit 1
fi
+# Fix a CMake syntax error:
+zcat $CWD/mariadb.ConnectorName.cmake.diff.gz | patch -p1 --verbose || exit 1
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \