Date: Thu, 10 Jan 2013 14:05:04 GMT From: Geoffroy Desvernay <dgeo@centrale-marseille.fr> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/175180: Un-break databases/mariadb-* after ports/174660 Message-ID: <201301101405.r0AE54TB006626@red.freebsd.org> Resent-Message-ID: <201301101410.r0AEA03X030212@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 175180
>Category: ports
>Synopsis: Un-break databases/mariadb-* after ports/174660
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 10 14:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Geoffroy Desvernay
>Release: 9.1-RELEASE
>Organization:
Ecole Centrale de Marseille
>Environment:
FreeBSD dgeo.sysadm.ec-m.fr 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Tue Dec 18 11:55:35 CET 2012 root@dgeo.sysadm.ec-m.fr:/usr/obj/usr/src/sys/DGEO amd64
>Description:
changes in bsd.database.mk from ports/174660 made databases/mariadb-* break.
This patch to bsd.database.mk and databases/mariadb-server should let it work again
>How-To-Repeat:
try to compile anything dependent on mariadb-client
>Fix:
patch attached (thanks to Jeff Wheelhouse)
Patch attached with submission follows:
--- Mk/bsd.database.mk- 2013-01-09 20:18:01.511346124 +0000
+++ Mk/bsd.database.mk 2013-01-09 20:18:39.700379158 +0000
@@ -109,6 +109,7 @@
MYSQL50_LIBVER= 15
MYSQL51_LIBVER= 16
MYSQL53_LIBVER= 16
+MYSQL53m_LIBVER= 16
MYSQL55_LIBVER= 18
MYSQL55p_LIBVER= 18
MYSQL55m_LIBVER= 18
@@ -153,6 +154,9 @@
.if (${MYSQL_VER} == "53")
_MYSQL_CLIENT= databases/mariadb-client
_MYSQL_SERVER= databases/mariadb-server
+.elif (${MYSQL_VER} == "53m")
+_MYSQL_CLIENT= databases/mariadb-client
+_MYSQL_SERVER= databases/mariadb-server
.elif (${MYSQL_VER} == "55p")
_MYSQL_CLIENT= databases/percona55-client
_MYSQL_SERVER= databases/percona55-server
--- databases/mariadb-server/Makefile- 2013-01-10 13:01:01.324427257 +0000
+++ databases/mariadb-server/Makefile 2013-01-10 13:01:17.510017470 +0000
@@ -28,7 +28,7 @@
.if !defined(MARIADB_CLIENT_SLAVE)
USE_MYSQL= yes
-WANT_MYSQL_VER= 53
+WANT_MYSQL_VER= 53m
.endif
.if !defined(MARIADB_SCRIPTS_SLAVE)
@@ -42,7 +42,7 @@
OPTIONS_DEFINE+= STATIC SSL OPENSSL
OPTIONS_DEFAULT+= SSL
-STATIC_DESC= Build statically linked executables (not on 9.x)
+STATIC_DESC= Statically link executables (not on 9.x)
SSL_DESC= Activate SSL support
OPENSSL_DESC= Use OpenSSL instead of bundled yassl
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301101405.r0AE54TB006626>