diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /databases/mariadb118-server/files/patch-FreeBSD15 | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'databases/mariadb118-server/files/patch-FreeBSD15')
| -rw-r--r-- | databases/mariadb118-server/files/patch-FreeBSD15 | 14 |
1 files changed, 4 insertions, 10 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 |