diff options
Diffstat (limited to 'databases/mariadb106-client/patches')
5 files changed, 75 insertions, 43 deletions
diff --git a/databases/mariadb106-client/patches/patch-CMakeLists.txt b/databases/mariadb106-client/patches/patch-CMakeLists.txt index 30710dae56d..6e68aa1ef91 100644 --- a/databases/mariadb106-client/patches/patch-CMakeLists.txt +++ b/databases/mariadb106-client/patches/patch-CMakeLists.txt @@ -1,10 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2021/08/04 15:47:24 nia Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.1.2.1 2021/12/14 08:59:19 tm Exp $ Allow building a server-only configuration. ---- CMakeLists.txt.orig 2021-05-05 21:00:18.000000000 +0000 +--- CMakeLists.txt.orig 2021-11-05 20:03:29.000000000 +0000 +++ CMakeLists.txt -@@ -421,8 +421,6 @@ ENDIF() +@@ -418,8 +418,6 @@ ENDIF() UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE) @@ -13,7 +13,7 @@ Allow building a server-only configuration. INCLUDE(cpack_rpm) INCLUDE(cpack_deb) -@@ -432,13 +430,11 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG) +@@ -429,19 +427,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG) # Add storage engines and plugins. CONFIGURE_PLUGINS() @@ -27,7 +27,13 @@ Allow building a server-only configuration. ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) ADD_SUBDIRECTORY(sql/share) -@@ -461,23 +457,26 @@ IF(NOT WITHOUT_SERVER) + + IF(NOT WITHOUT_SERVER) +- ADD_SUBDIRECTORY(tests) + ADD_SUBDIRECTORY(sql) + OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF) + IF(WITH_EMBEDDED_SERVER) +@@ -460,23 +455,26 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(win/upgrade_wizard) ADD_SUBDIRECTORY(win/packaging) ENDIF() @@ -59,3 +65,45 @@ Allow building a server-only configuration. ENDIF() # minimal target to build only binaries for export ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED}) +@@ -557,41 +555,3 @@ IF(NON_DISTRIBUTABLE_WARNING) + MESSAGE(WARNING " + You have linked MariaDB with ${NON_DISTRIBUTABLE_WARNING} libraries! You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with the Free Software Foundation.") + ENDIF() +- +-IF(NOT WITHOUT_SERVER) +- # Define target for minimal mtr-testable build +- ADD_CUSTOM_TARGET(minbuild) +- ADD_DEPENDENCIES(minbuild +- aria_chk +- aria_pack +- mariadb +- mariadb-admin +- mariadb-binlog +- mariadb-check +- mariadb-client-test +- mariadb-conv +- mariadb-dump +- mariadb-import +- mariadb-plugin +- mariadb-show +- mariadb-slap +- mariadb-test +- mariadb-tzinfo-to-sql +- mariadb-upgrade +- mariadbd +- my_print_defaults +- my_safe_process +- myisam_ftdump +- myisamchk +- myisamlog +- myisampack +- perror +- replace) +- IF(WIN32) +- ADD_DEPENDENCIES(minbuild echo mariadb-install-db my_safe_kill) +- ENDIF() +- ADD_CUSTOM_TARGET(smoketest +- COMMAND perl ./mysql-test-run.pl main.1st +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/mysql-test) +- ADD_DEPENDENCIES(smoketest minbuild) +-ENDIF() diff --git a/databases/mariadb106-client/patches/patch-plugin_auth__pam_CMakeLists.txt b/databases/mariadb106-client/patches/patch-plugin_auth__pam_CMakeLists.txt deleted file mode 100644 index 19179b359e5..00000000000 --- a/databases/mariadb106-client/patches/patch-plugin_auth__pam_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-plugin_auth__pam_CMakeLists.txt,v 1.1 2021/08/04 15:47:24 nia Exp $ - -Check for pam_ext.h (not available on NetBSD). - ---- plugin/auth_pam/CMakeLists.txt.orig 2021-02-18 23:22:29.000000000 +0000 -+++ plugin/auth_pam/CMakeLists.txt -@@ -43,7 +43,7 @@ IF(HAVE_PAM_APPL_H) - WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)" - COMPONENT Server) - ENDIF() -- IF(TARGET auth_pam OR TARGET auth_pam_v1) -+ IF(HAVE_PAM_EXT_H AND (TARGET auth_pam OR TARGET auth_pam_v1)) - ADD_SUBDIRECTORY(testing) - ADD_LIBRARY(pam_user_map MODULE mapper/pam_user_map.c) - TARGET_LINK_LIBRARIES(pam_user_map pam) diff --git a/databases/mariadb106-client/patches/patch-plugin_auth__socket_auth__socket.c b/databases/mariadb106-client/patches/patch-plugin_auth__socket_auth__socket.c deleted file mode 100644 index 1a2f1f5b37a..00000000000 --- a/databases/mariadb106-client/patches/patch-plugin_auth__socket_auth__socket.c +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-plugin_auth__socket_auth__socket.c,v 1.1 2021/08/04 15:47:24 nia Exp $ - -Add SO_PEERCRED definitions for NetBSD. -https://github.com/MariaDB/server/pull/1884 - ---- plugin/auth_socket/auth_socket.c.orig 2021-07-05 10:15:49.000000000 +0000 -+++ plugin/auth_socket/auth_socket.c -@@ -47,6 +47,13 @@ - #define uid cr_uid - #define ucred xucred - -+#elif defined HAVE_UNPCBID -+#include <sys/un.h> -+#define level 0 -+#define SO_PEERCRED LOCAL_PEEREID -+#define uid unp_euid -+#define ucred unpcbid -+ - #elif defined HAVE_GETPEERUCRED - #include <ucred.h> - diff --git a/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt b/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt index 4923c7fa51a..e7b824b9fd7 100644 --- a/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt +++ b/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt @@ -1,8 +1,8 @@ -$NetBSD: patch-scripts_CMakeLists.txt,v 1.1 2021/08/04 15:47:24 nia Exp $ +$NetBSD: patch-scripts_CMakeLists.txt,v 1.1.2.1 2021/12/14 08:59:19 tm Exp $ Allow building a server-only configuration. ---- scripts/CMakeLists.txt.orig 2021-07-05 10:15:49.000000000 +0000 +--- scripts/CMakeLists.txt.orig 2021-11-05 20:03:30.000000000 +0000 +++ scripts/CMakeLists.txt @@ -324,22 +324,26 @@ ELSE() mariadbd-safe diff --git a/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h b/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h new file mode 100644 index 00000000000..b147da6162b --- /dev/null +++ b/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h @@ -0,0 +1,20 @@ +$NetBSD: patch-storage_innobase_include_transactional__lock__guard.h,v 1.1.2.2 2021/12/14 08:59:19 tm Exp $ + +Strange build failures on NetBSD: +error: 'rw_lock' is not an accessible base of 'page_hash_latch' + +--- storage/innobase/include/transactional_lock_guard.h.orig 2021-11-05 20:03:31.000000000 +0000 ++++ storage/innobase/include/transactional_lock_guard.h +@@ -21,12 +21,6 @@ this program; if not, write to the Free + #if defined __powerpc64__ && defined __clang__ && defined __linux__ + #elif defined __powerpc64__&&defined __GNUC__&&defined __linux__&&__GNUC__ > 4 + #elif defined _MSC_VER && (defined _M_IX86 || defined _M_X64) +-#elif defined __GNUC__ && (defined __i386__ || defined __x86_64__) +-# if __GNUC__ >= 8 +-# elif defined __clang_major__ && __clang_major__ > 6 +-# else +-# define NO_ELISION +-# endif + #else /* Transactional memory has not been implemented for this ISA */ + # define NO_ELISION + #endif |