mirror of
https://git.freebsd.org/ports.git
synced 2025-06-13 08:40:39 -04:00
6cead7efb7
- Update to 10.0.29 - Update mariadb100-client - Update patches - Regen patches with makepatch - Pet portlint - Add MROONGA liblz4 dependency - Fix MROONGA liblz4 linking - rm erroneously installed files PR: 197232, 204014, 215901 MFH: 2017Q1 Security: 22373c43-d728-11e6-a9a5-b499baebfeaf
14 lines
820 B
Bash
14 lines
820 B
Bash
--- scripts/mysql_config.sh.orig 2017-01-14 21:33:31 UTC
|
|
+++ scripts/mysql_config.sh
|
|
@@ -109,8 +109,11 @@ fi
|
|
# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
|
|
libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
|
|
libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
|
|
+libs="$libs -L%%LOCALBASE%%/lib "
|
|
libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
|
|
+libs_r="$libs_r -L%%LOCALBASE%%/lib "
|
|
embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
|
|
+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
|
|
|
|
if [ -r "$pkglibdir/libmygcc.a" ]; then
|
|
# When linking against the static library with a different version of GCC
|