diff options
| author | flo <flo@FreeBSD.org> | 2013-10-17 13:16:44 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2013-10-17 13:16:44 +0800 |
| commit | bc452f7af63b3a92726a3a61e64ae506c0e43679 (patch) | |
| tree | 2380cdb832ec3e55e2d89d6627a670fa63f606e5 /databases | |
| parent | f724b74b3515e5d1eb0b97511bbfb640cab2c283 (diff) | |
| download | freebsd-ports-gnome-bc452f7af63b3a92726a3a61e64ae506c0e43679.tar.gz freebsd-ports-gnome-bc452f7af63b3a92726a3a61e64ae506c0e43679.tar.zst freebsd-ports-gnome-bc452f7af63b3a92726a3a61e64ae506c0e43679.zip | |
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]
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mariadb55-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/mariadb55-client/files/patch-scripts_mysql_config.sh | 14 | ||||
| -rw-r--r-- | databases/mariadb55-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/mariadb55-server/files/patch-scripts_mysql_config.sh | 14 |
4 files changed, 31 insertions, 1 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 diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile index c593da40677f..b4894441e636 100644 --- a/databases/mariadb55-server/Makefile +++ b/databases/mariadb55-server/Makefile @@ -2,7 +2,7 @@ PORTNAME?= mariadb PORTVERSION= 5.5.33a -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ @@ -133,6 +133,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt + @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh .include <bsd.port.pre.mk> 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..a17b750e634d --- /dev/null +++ b/databases/mariadb55-server/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 |