summaryrefslogtreecommitdiffstats
path: root/source/ap
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap')
-rw-r--r--source/ap/mariadb/mariadb.ConnectorName.cmake.diff12
-rwxr-xr-xsource/ap/mariadb/mariadb.SlackBuild5
2 files changed, 1 insertions, 16 deletions
diff --git a/source/ap/mariadb/mariadb.ConnectorName.cmake.diff b/source/ap/mariadb/mariadb.ConnectorName.cmake.diff
deleted file mode 100644
index 75da7d99..00000000
--- a/source/ap/mariadb/mariadb.ConnectorName.cmake.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-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 b83511e9..63428060 100755
--- a/source/ap/mariadb/mariadb.SlackBuild
+++ b/source/ap/mariadb/mariadb.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
# Copyright 2011, 2012, 2013, 2014, 2017 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
@@ -97,9 +97,6 @@ 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 \) \