Date: Thu, 17 Oct 2013 05:16:44 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330601 - in head/databases: mariadb55-client mariadb55-client/files mariadb55-server mariadb55-server/files Message-ID: <201310170516.r9H5GiXK038178@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Thu Oct 17 05:16:44 2013 New Revision: 330601 URL: http://svnweb.freebsd.org/changeset/ports/330601 Log: 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] Added: head/databases/mariadb55-client/files/patch-scripts_mysql_config.sh (contents, props changed) head/databases/mariadb55-server/files/patch-scripts_mysql_config.sh (contents, props changed) Modified: head/databases/mariadb55-client/Makefile head/databases/mariadb55-server/Makefile Modified: head/databases/mariadb55-client/Makefile ============================================================================== --- head/databases/mariadb55-client/Makefile Thu Oct 17 04:01:01 2013 (r330600) +++ head/databases/mariadb55-client/Makefile Thu Oct 17 05:16:44 2013 (r330601) @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= mariadb +PORTREVISION= 1 PKGNAMESUFFIX= 55-client COMMENT= Multithreaded SQL database (client) Added: head/databases/mariadb55-client/files/patch-scripts_mysql_config.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb55-client/files/patch-scripts_mysql_config.sh Thu Oct 17 05:16:44 2013 (r330601) @@ -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 Modified: head/databases/mariadb55-server/Makefile ============================================================================== --- head/databases/mariadb55-server/Makefile Thu Oct 17 04:01:01 2013 (r330600) +++ head/databases/mariadb55-server/Makefile Thu Oct 17 05:16:44 2013 (r330601) @@ -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- 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> Added: head/databases/mariadb55-server/files/patch-scripts_mysql_config.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb55-server/files/patch-scripts_mysql_config.sh Thu Oct 17 05:16:44 2013 (r330601) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310170516.r9H5GiXK038178>