diff options
Diffstat (limited to 'databases/mariadb118-server/files')
| -rw-r--r-- | databases/mariadb118-server/files/patch-FreeBSD15 | 14 | ||||
| -rw-r--r-- | databases/mariadb118-server/files/patch-tpool_CMakeLists.txt | 14 |
2 files changed, 11 insertions, 17 deletions
diff --git a/databases/mariadb118-server/files/patch-FreeBSD15 b/databases/mariadb118-server/files/patch-FreeBSD15 index 7fb744032638..6b1462bb0c14 100644 --- a/databases/mariadb118-server/files/patch-FreeBSD15 +++ b/databases/mariadb118-server/files/patch-FreeBSD15 @@ -22,20 +22,14 @@ FreeBSD 14.x and 15.x when LD_LIBRARY_PATH is not set (when using FreeBSD packages or installing from FreeBSD ports). Setting LD_LIBRARY_PATH manually like the script does, breaks mariadb-backup with the "Undefined symbol" error on FreeBSD 15.0 but not on 14.x. ---- - scripts/wsrep_sst_common.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh -index 38aa18d5f6967..edde8328effe9 100644 ---- scripts/wsrep_sst_common.sh.orig +--- scripts/wsrep_sst_common.sh.orig 2025-11-07 08:07:31 UTC +++ scripts/wsrep_sst_common.sh -@@ -25,7 +25,7 @@ OS="$(uname)" +@@ -25,7 +25,7 @@ export PATH="${PATH:+$PATH:}/usr/local/bin:/usr/local/ # Setting the paths for some utilities on CentOS - export PATH="${PATH:+$PATH:}/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin" + export PATH="${PATH:+$PATH:}/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin" -if [ "$OS" != 'Darwin' ]; then +if [ "$OS" != 'Darwin' ] && [ "$OS" != 'FreeBSD' ]; then - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/local/lib:/usr/lib:/lib:/opt/lib" + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/local/lib:/lib:/usr/lib:/opt/lib" fi diff --git a/databases/mariadb118-server/files/patch-tpool_CMakeLists.txt b/databases/mariadb118-server/files/patch-tpool_CMakeLists.txt index ac7ffa59c4c2..a383d718c8e0 100644 --- a/databases/mariadb118-server/files/patch-tpool_CMakeLists.txt +++ b/databases/mariadb118-server/files/patch-tpool_CMakeLists.txt @@ -1,11 +1,11 @@ ---- tpool/CMakeLists.txt.orig 2025-07-28 19:35:07 UTC +--- tpool/CMakeLists.txt.orig 2025-11-04 17:38:14 UTC +++ tpool/CMakeLists.txt -@@ -11,7 +11,7 @@ TARGET_INCLUDE_DIRECTORIES(tpool PUBLIC "${CMAKE_CURRE +@@ -8,7 +8,7 @@ SET(COMMON_SOURCES + wait_notification.cc + ) - TARGET_INCLUDE_DIRECTORIES(tpool PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" - PRIVATE ${PROJECT_SOURCE_DIR}/include) - +ADD_DEFINITIONS(-fPIC) - IF(WIN32) - TARGET_SOURCES(tpool PRIVATE tpool_win.cc aio_win.cc) - ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") + IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") + ADD_LIBRARY(tpool OBJECT ${COMMON_SOURCES} aio_simulated.cc) + IF(WIN32) |