head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.4 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.2 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.1.0.4 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.2 pkgsrc-2025Q2-base:1.1; locks; strict; comment @# @; 1.2 date 2025.10.27.20.56.37; author nia; state Exp; branches; next 1.1; commitid qUADGNDwnZ8NBfgG; 1.1 date 2025.06.07.08.58.42; author nia; state Exp; branches; next ; commitid vXq1mbQoioDU9WXF; desc @@ 1.2 log @mariadb118-client: Update to 11.8.3 The usual bundle of reliability fixes. @ text @$NetBSD: patch-CMakeLists.txt,v 1.1 2024/08/21 21:08:34 nia Exp $ Allow building a server-only configuration. --- CMakeLists.txt.orig 2025-05-19 16:14:23.000000000 +0000 +++ CMakeLists.txt @@@@ -457,8 +457,6 @@@@ ENDIF() UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE) -INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb) - INCLUDE(cpack_tgz) INCLUDE(cpack_rpm) INCLUDE(cpack_deb) @@@@ -469,19 +467,16 @@@@ MARK_AS_ADVANCED(PYTHON_SHEBANG) # Add storage engines and plugins. CONFIGURE_PLUGINS() -ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(dbug) ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(vio) ADD_SUBDIRECTORY(mysys) ADD_SUBDIRECTORY(mysys_ssl) -ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) ADD_SUBDIRECTORY(sql/share) IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(sql) OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF) IF(WITH_EMBEDDED_SERVER) @@@@ -500,10 +495,12 @@@@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(win/upgrade_wizard) ADD_SUBDIRECTORY(win/packaging) ENDIF() -ENDIF() - -IF(UNIX) +ELSE() + INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb) + ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(man) + ADD_SUBDIRECTORY(support-files) ENDIF() IF (NOT WITHOUT_ABI_CHECK) @@@@ -512,13 +509,14 @@@@ ENDIF() INCLUDE(cmake/tags.cmake) INCLUDE(for_clients) ADD_SUBDIRECTORY(scripts) -ADD_SUBDIRECTORY(support-files) ADD_SUBDIRECTORY(extra/aws_sdk) IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR) - SET(EXPORTED comp_err comp_sql factorial uca-dump) + SET(EXPORTED comp_err factorial uca-dump) IF(NOT WITHOUT_SERVER) SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token) + ELSE() + SET(EXPORTED ${EXPORTED} comp_sql) ENDIF() # minimal target to build only binaries for export ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED}) @@@@ -590,7 +588,7 @@@@ IF(WIN32 AND SIGNCODE) INSTALL(SCRIPT ${PROJECT_BINARY_DIR}/sign.cmake) ENDIF() -FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES VAR MARIADB_FEATURE_SUMMARY) +FEATURE_SUMMARY(WHAT ALL VAR MARIADB_FEATURE_SUMMARY) OPTION(FEATURE_SUMMARY "Print feature summary at the end of configure step" ON) IF (FEATURE_SUMMARY) @@@@ -602,41 +600,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 mariadb-upgrade-service) - 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() @ 1.1 log @mariadb118: Initial import MariaDB 11.8 is a long-term release series, maintained until Jun 2028. Notable features since 11.4, the last LTS branch: - aarch64 SIMD instructions now supported in Vectors - Optimizer improvements - Configure limits on sizes of temporary files - Y2038 support for TIMESTAMP values on 64-bit platforms - Added the --dir option to mariadb-import, allowing one to restore all tables from a backup directory created using mariadb-dump --dir - The mariadb-dump --no-autocommit option is now set by default to allow faster data loading by InnoDB, writing only one undo log for the whole operation - mariadb-import has a new option, --innodb-optimize-keys to delay creation of secondary indexes - New USERS table in the Information Schema for storing information about users - More columns in Information Schema for greater observability - SESSION_USER(), which used to be an alias for USER() now shows the value of CURRENT_USER() when the session was created pkgsrc-specific notes: - This has been verified to build successfully on NetBSD, FreeBSD, OpenBSD, macOS (arm & x86), Linux. SunOS tests should happen. - This now requires a C++17 compiler instead of a C++11 compiler. - Care should be taken before switching the default MariaDB version for the above reasons. - The new PARSEC plugin is disabled by default to avoid PLIST troubles - it depends on specific features added in a specific version of OpenSSL. @ text @@