diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-10-17 05:16:44 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-10-17 05:16:44 +0000 |
| commit | 79483ff6003b0ed42e823bf8d6ae5652810c5d21 (patch) | |
| tree | 2380cdb832ec3e55e2d89d6627a670fa63f606e5 /databases/mariadb55-client | |
| parent | f1393f84fb581caef1a013016136549c8d342c5c (diff) | |
Fix linking to mariadb libs [1]
PR: ports/183001 [1]
PR: ports/182565 [2]
Submitted by: Alexandr Kovalenko <never@nevermind.kiev.ua> [1]
Reported by: Vincent Hoffman-Kazlauskas <vince@unsane.co.uk> [2]
Notes
Notes:
svn path=/head/; revision=330601
Diffstat (limited to 'databases/mariadb55-client')
| -rw-r--r-- | databases/mariadb55-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/mariadb55-client/files/patch-scripts_mysql_config.sh | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/databases/mariadb55-client/Makefile b/databases/mariadb55-client/Makefile index 5aa4f97e960a..030f8c6cac92 100644 --- a/databases/mariadb55-client/Makefile +++ b/databases/mariadb55-client/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= mariadb +PORTREVISION= 1 PKGNAMESUFFIX= 55-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mariadb55-client/files/patch-scripts_mysql_config.sh b/databases/mariadb55-client/files/patch-scripts_mysql_config.sh new file mode 100644 index 000000000000..a17b750e634d --- /dev/null +++ b/databases/mariadb55-client/files/patch-scripts_mysql_config.sh @@ -0,0 +1,14 @@ +--- scripts/mysql_config.sh.orig 2013-09-20 01:34:23.000000000 +0300 ++++ scripts/mysql_config.sh 2013-10-15 21:23:34.000000000 +0300 +@@ -108,8 +108,11 @@ + # We intentionally add a space to the beginning and end of lib strings, simplifies replace later + libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" + libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " ++libs="$libs -L%%LOCALBASE%%/lib " + libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " ++libs_r="$libs_r -L%%LOCALBASE%%/lib " + embedded_libs=" $ldflags -L$pkglibdir -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 |