CVS commit: pkgsrc/databases/mariadb118-client

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jun 20 14:03:22 UTC 2025

Modified Files:
        pkgsrc/databases/mariadb118-client: distinfo
        pkgsrc/databases/mariadb118-client/patches: patch-sql_mysqld.cc
Added Files:
        pkgsrc/databases/mariadb118-client/patches: patch-mysys_my__largepage.c

Log Message:
mariadb118-client: Build fixes for illumos.

via OmniOS CE.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb118-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mariadb118-client/patches/patch-mysys_my__largepage.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/mariadb118-client/patches/patch-sql_mysqld.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mariadb118-client/distinfo
diff -u pkgsrc/databases/mariadb118-client/distinfo:1.1 pkgsrc/databases/mariadb118-client/distinfo:1.2
--- pkgsrc/databases/mariadb118-client/distinfo:1.1     Sat Jun  7 08:58:42 2025
+++ pkgsrc/databases/mariadb118-client/distinfo Fri Jun 20 14:03:21 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2025/06/07 08:58:42 nia Exp $
+$NetBSD: distinfo,v 1.2 2025/06/20 14:03:21 nia Exp $
 
 BLAKE2s (mariadb-11.8.2.tar.gz) = 261989030b78edfd49637e00300a8ae9473611d0e1420e11198d361972c20961
 SHA512 (mariadb-11.8.2.tar.gz) = f915194e62633cc7c8b2fa901d83b30bdf6e3b8051c2d7e39dcae0a819787cc1f54dd92fdf692c9100ffbdc66b57e265bcc0433fcc2a80324b8dac16653de41e
@@ -14,13 +14,14 @@ SHA1 (patch-include_my__global.h) = a3b8
 SHA1 (patch-libmariadb_cmake_FindGSSAPI.cmake) = 94b268478e680b82b1c108a12c0f37f3dc68ffce
 SHA1 (patch-libservices_CMakeLists.txt) = abac6b86bfcd7e57937fe485803a8a50eb5b91ae
 SHA1 (patch-mysys_my__gethwaddr.c) = c3f179aa659e16f2fd9b858a718dd1cdd6f93c9f
+SHA1 (patch-mysys_my__largepage.c) = 9fefb0bcf167d7de0a42a3ca335d555ef6b46400
 SHA1 (patch-plugin_auth__gssapi_cmake_FindGSSAPI.cmake) = 215d48d80fe4dd018678ec7b03fc40ca1caf4f16
 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51
 SHA1 (patch-plugin_daemon__example_CMakeLists.txt) = 1a8efe4886818839bea48e980a694a60de6783dc
 SHA1 (patch-plugin_hashicorp__key__management_CMakeLists.txt) = 974575e3e8e39e7b24a956d8caaca5c7af2f5095
 SHA1 (patch-scripts_CMakeLists.txt) = b8a13304e314162ab0a1fc06c5620d6b757975f5
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
-SHA1 (patch-sql_mysqld.cc) = 8820f78278ff099e5eb80528e8b501ba770fbe2a
+SHA1 (patch-sql_mysqld.cc) = fd8f215da733b0a50adf5d16f5a697062240b1de
 SHA1 (patch-sql_share_CMakeLists.txt) = 54fec8bd52a9d66f23a2ddcfd3c3730dabdd8011
 SHA1 (patch-storage_innobase_include_transactional__lock__guard.h) = d5ff507acdd21858791246ef5a2559e653cb7833
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083

Index: pkgsrc/databases/mariadb118-client/patches/patch-sql_mysqld.cc
diff -u pkgsrc/databases/mariadb118-client/patches/patch-sql_mysqld.cc:1.1 pkgsrc/databases/mariadb118-client/patches/patch-sql_mysqld.cc:1.2
--- pkgsrc/databases/mariadb118-client/patches/patch-sql_mysqld.cc:1.1  Sat Jun  7 08:58:43 2025
+++ pkgsrc/databases/mariadb118-client/patches/patch-sql_mysqld.cc      Fri Jun 20 14:03:21 2025
@@ -1,11 +1,19 @@
-$NetBSD: patch-sql_mysqld.cc,v 1.1 2025/06/07 08:58:43 nia Exp $
+$NetBSD: patch-sql_mysqld.cc,v 1.2 2025/06/20 14:03:21 nia Exp $
 
-Add missing declaration of "concurrency".
-Fixes build on illumos. From OmniOS CE.
+Build fixes for illumos. From OmniOS CE.
 
---- sql/mysqld.cc.orig 2024-08-21 18:47:03.556109771 +0000
+--- sql/mysqld.cc.orig 2025-05-21 14:08:47.000000000 +0000
 +++ sql/mysqld.cc
-@@ -467,7 +467,7 @@ Atomic_counter<uint32_t> slave_open_temp
+@@ -429,7 +429,7 @@ char* opt_secure_file_priv;
+ my_bool lower_case_file_system= 0;
+ my_bool opt_large_pages= 0;
+ #ifdef HAVE_SOLARIS_LARGE_PAGES
+-my_bool opt_super_large_pages= 0;
++extern my_bool opt_super_large_pages;
+ #endif
+ my_bool opt_myisam_use_mmap= 0;
+ uint   opt_large_page_size= 0;
+@@ -473,7 +473,7 @@ Atomic_counter<uint32_t> slave_open_temp
  */
  Atomic_counter<ulonglong> sending_new_binlog_file;
  ulong thread_created;

Added files:

Index: pkgsrc/databases/mariadb118-client/patches/patch-mysys_my__largepage.c
diff -u /dev/null pkgsrc/databases/mariadb118-client/patches/patch-mysys_my__largepage.c:1.1
--- /dev/null   Fri Jun 20 14:03:22 2025
+++ pkgsrc/databases/mariadb118-client/patches/patch-mysys_my__largepage.c      Fri Jun 20 14:03:21 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-mysys_my__largepage.c,v 1.1 2025/06/20 14:03:21 nia Exp $
+
+Fix build on illumos, via OmniOS CE.
+
+Undefined                       first referenced
+ symbol                             in file
+opt_super_large_pages               ../../mysys/libmysys.a(my_largepage.c.o)
+
+--- mysys/my_largepage.c.orig  2025-05-21 14:08:44.000000000 +0000
++++ mysys/my_largepage.c
+@@ -28,6 +28,7 @@
+ #endif
+ 
+ #ifdef HAVE_SOLARIS_LARGE_PAGES
++my_bool opt_super_large_pages= 0;
+ #if defined(__sun__) && defined(__GNUC__) && defined(__cplusplus) \
+     && defined(_XOPEN_SOURCE)
+ /* memcntl exist within sys/mman.h, but under-defines what is need to use it */
+@@ -203,7 +204,6 @@ int my_init_large_pages(void)
+   my_get_large_page_sizes(my_large_page_sizes);
+ 
+ #ifdef HAVE_SOLARIS_LARGE_PAGES
+-  extern my_bool opt_super_large_pages;
+   /*
+     tell the kernel that we want to use 4/256MB page for heap storage
+     and also for the stack. We use 4 MByte as default and if the