CVS commit: pkgsrc/databases/mariadb1011-client

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jun 20 17:04:41 UTC 2025

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

Log Message:
mariadb1011-client: Fix server build on illumos

via OmniOS CE


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/mariadb1011-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mariadb1011-client/patches/patch-mysys_my__largepage.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/databases/mariadb1011-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/mariadb1011-client/distinfo
diff -u pkgsrc/databases/mariadb1011-client/distinfo:1.15 pkgsrc/databases/mariadb1011-client/distinfo:1.16
--- pkgsrc/databases/mariadb1011-client/distinfo:1.15   Fri Jun  6 20:48:33 2025
+++ pkgsrc/databases/mariadb1011-client/distinfo        Fri Jun 20 17:04:41 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2025/06/06 20:48:33 nia Exp $
+$NetBSD: distinfo,v 1.16 2025/06/20 17:04:41 nia Exp $
 
 BLAKE2s (mariadb-10.11.13.tar.gz) = 23965d289e03ea187bb48a0721396ad79425f02b7334ee46e12925ced3588f00
 SHA512 (mariadb-10.11.13.tar.gz) = 4eff7f30fdbfdbeafb6c708262a89bcb2065261c384b5b027720dd7a7a7dc79ecbdb70339aec05c813d7991c3807af09c300841e731e5c925a1adf5b3fcd0580
@@ -12,11 +12,12 @@ SHA1 (patch-extra_readline_CMakeLists.tx
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
 SHA1 (patch-libmariadb_cmake_FindGSSAPI.cmake) = 94b268478e680b82b1c108a12c0f37f3dc68ffce
 SHA1 (patch-mysys_my__gethwaddr.c) = c3f179aa659e16f2fd9b858a718dd1cdd6f93c9f
+SHA1 (patch-mysys_my__largepage.c) = 3e48863214b0b46ffaa96f70107540f61ba9d656
 SHA1 (patch-plugin_auth__gssapi_cmake_FindGSSAPI.cmake) = 215d48d80fe4dd018678ec7b03fc40ca1caf4f16
 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51
 SHA1 (patch-scripts_CMakeLists.txt) = b8a13304e314162ab0a1fc06c5620d6b757975f5
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
-SHA1 (patch-sql_mysqld.cc) = f7704b39ae5101b46289692f346a6f17ba5e219c
+SHA1 (patch-sql_mysqld.cc) = ab842758c17acff455dee89a48118d50f51dc786
 SHA1 (patch-storage_innobase_include_transactional__lock__guard.h) = d5ff507acdd21858791246ef5a2559e653cb7833
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.h) = d790c092d7d35d014c5ef209635c18614c3a8301

Index: pkgsrc/databases/mariadb1011-client/patches/patch-sql_mysqld.cc
diff -u pkgsrc/databases/mariadb1011-client/patches/patch-sql_mysqld.cc:1.3 pkgsrc/databases/mariadb1011-client/patches/patch-sql_mysqld.cc:1.4
--- pkgsrc/databases/mariadb1011-client/patches/patch-sql_mysqld.cc:1.3 Sat Aug 17 00:19:21 2024
+++ pkgsrc/databases/mariadb1011-client/patches/patch-sql_mysqld.cc     Fri Jun 20 17:04:41 2025
@@ -1,11 +1,19 @@
-$NetBSD: patch-sql_mysqld.cc,v 1.3 2024/08/17 00:19:21 nia Exp $
+$NetBSD: patch-sql_mysqld.cc,v 1.4 2025/06/20 17:04:41 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-03 07:29:59.000000000 +0000
+--- sql/mysqld.cc.orig 2025-05-19 16:14:25.000000000 +0000
 +++ sql/mysqld.cc
-@@ -455,7 +455,7 @@ Atomic_counter<uint32_t> THD_count::coun
+@@ -421,7 +421,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;
+@@ -457,7 +457,7 @@ Atomic_counter<uint32_t> THD_count::coun
  bool shutdown_wait_for_slaves;
  Atomic_counter<uint32_t> slave_open_temp_tables;
  ulong thread_created;

Added files:

Index: pkgsrc/databases/mariadb1011-client/patches/patch-mysys_my__largepage.c
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-mysys_my__largepage.c:1.1
--- /dev/null   Fri Jun 20 17:04:41 2025
+++ pkgsrc/databases/mariadb1011-client/patches/patch-mysys_my__largepage.c     Fri Jun 20 17:04:41 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-mysys_my__largepage.c,v 1.1 2025/06/20 17:04:41 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-19 16:14:25.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