diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2015-08-12 13:19:36 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2015-08-12 13:19:36 +0000 |
| commit | 4af533cdd3b05dd2ffa3f86bd7fb3e3b34712ebf (patch) | |
| tree | 9eb7da1ac6becd20e72014281649419132f02d48 /databases/mariadb100-server/files/patch-scripts_mysql__config.sh | |
| parent | Update to ocurl 0.7.5 (bugfix release) (diff) | |
databases/mariadb100-server: Update to 10.0.21
- Update to 10.0.21
- Updates mariadb100-client as well (slave-port)
- Silence portlint
- Re-roll patches with makepatch
[1] https://mariadb.atlassian.net/browse/MDEV-7398
[2] https://mariadb.atlassian.net/browse/MDEV-8128
Changes: https://mariadb.com/kb/en/mariadb/mariadb-10021-changelog/
Differential revision: https://reviews.freebsd.org/D2771
Reviewed by: koobs (mentor), vsevolod (mentor)
Approved by: vsevolod (mentor)
PR: 200097
Security: 36bd352d-299b-11e5-86ff-14dae9d210b8
MFH: 2015Q3
Notes
Notes:
svn path=/head/; revision=394020
Diffstat (limited to 'databases/mariadb100-server/files/patch-scripts_mysql__config.sh')
| -rw-r--r-- | databases/mariadb100-server/files/patch-scripts_mysql__config.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/databases/mariadb100-server/files/patch-scripts_mysql__config.sh b/databases/mariadb100-server/files/patch-scripts_mysql__config.sh new file mode 100644 index 000000000000..bbf559927e05 --- /dev/null +++ b/databases/mariadb100-server/files/patch-scripts_mysql__config.sh @@ -0,0 +1,14 @@ +--- scripts/mysql_config.sh.orig 2015-06-17 14:54:12 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 |