diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2017-05-04 09:33:18 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2017-05-04 09:33:18 +0000 |
| commit | e1822696f3e93a27ffdc0cdb1b819500c2ef67ab (patch) | |
| tree | 965588404bc3f21423336be4e298ca6980a526f7 /databases/mariadb55-server/files/patch-scripts_mysql__config.sh | |
| parent | databases/mariadb101-server: Update to 10.1.23 (diff) | |
databases/mariadb55-server: Update to 5.5.56
- Bugfix update to 5.5.56
- Re-roll patches
- Convert patches to new naming convention
- Add/move ldconfig config to -server
- Move client option to -client port
Notes
Notes:
svn path=/head/; revision=440095
Diffstat (limited to 'databases/mariadb55-server/files/patch-scripts_mysql__config.sh')
| -rw-r--r-- | databases/mariadb55-server/files/patch-scripts_mysql__config.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/databases/mariadb55-server/files/patch-scripts_mysql__config.sh b/databases/mariadb55-server/files/patch-scripts_mysql__config.sh new file mode 100644 index 000000000000..8788844b5670 --- /dev/null +++ b/databases/mariadb55-server/files/patch-scripts_mysql__config.sh @@ -0,0 +1,14 @@ +--- scripts/mysql_config.sh.orig 2017-04-30 11:09: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 |