diff options
Diffstat (limited to 'databases/mariadb104-server/files')
| -rw-r--r-- | databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt | 18 | ||||
| -rw-r--r-- | databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh | 6 |
2 files changed, 14 insertions, 10 deletions
diff --git a/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt b/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt index 0542221db134..8f6733715ad3 100644 --- a/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt +++ b/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt @@ -1,14 +1,18 @@ ---- libmariadb/libmariadb/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC +--- libmariadb/libmariadb/CMakeLists.txt.orig 2022-02-10 19:42:57 UTC +++ libmariadb/libmariadb/CMakeLists.txt -@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT +@@ -459,6 +459,7 @@ IF(NOT WIN32) + SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}") + ENDIF() + ++IF(NOT WITHOUT_CLIENT) INSTALL(TARGETS mariadbclient COMPONENT Development DESTINATION ${INSTALL_LIBDIR}) -+IF(NOT WITHOUT_CLIENT) - INSTALL(TARGETS libmariadb - COMPONENT SharedLibraries - DESTINATION ${INSTALL_LIBDIR}) +@@ -470,6 +471,7 @@ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTA + COMPONENT SharedLibraries NAMELINK_SKIP) + INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} + COMPONENT Development NAMELINK_ONLY) +ENDIF() - IF(WIN32) + IF(MSVC) # On Windows, install PDB diff --git a/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh index dc45c2d238c7..3e3d42812b67 100644 --- a/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh +++ b/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh @@ -1,9 +1,9 @@ ---- scripts/wsrep_sst_mariabackup.sh.orig 2021-06-09 14:23:11.000000000 +0200 +--- scripts/wsrep_sst_mariabackup.sh.orig 2022-02-17 10:18:49 UTC +++ scripts/wsrep_sst_mariabackup.sh -@@ -696,7 +696,7 @@ +@@ -715,7 +715,7 @@ recv_joiner() local ltcmd="$tcmd" if [ $tmt -gt 0 ]; then - if [ -n "$(command -v timeout)" ]; then + if [ -n "$(commandex timeout)" ]; then - if timeout --help | grep -qw -- '-k'; then + if timeout --help 2>&1 | grep -qw -- '-k'; then ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd" |