svn commit: r450384 - head/Mk/Uses
Mahdi Mokhtari
mmokhi at FreeBSD.org
Fri Sep 22 15:28:10 UTC 2017
Author: mmokhi
Date: Fri Sep 22 15:28:09 2017
New Revision: 450384
URL: https://svnweb.freebsd.org/changeset/ports/450384
Log:
Mk/Uses/mysql.mk: Change the way of extracting version info from MySQL flavors
Use `mysql_config --version` instead of `mysql --version` because
in MySQL 8.0 the format of output is changed and it'd be [more reliable] and
easier to use just mysql_config because it only returns the numbers we want.
Reviewed by: brnrd, mat (mentor, portmgr)
Approved by: brnrd, mat (mentor, portmgr)
Sponsored by: EuroBSDCon Paris Devsummit
Differential Revision: https://reviews.freebsd.org/D12458
Modified:
head/Mk/Uses/mysql.mk
Modified: head/Mk/Uses/mysql.mk
==============================================================================
--- head/Mk/Uses/mysql.mk Fri Sep 22 15:22:56 2017 (r450383)
+++ head/Mk/Uses/mysql.mk Fri Sep 22 15:28:09 2017 (r450384)
@@ -75,7 +75,7 @@ MYSQL102m_LIBVER= 3
# Setting/finding MySQL version we want.
.if exists(${LOCALBASE}/bin/mysql)
-_MYSQL!= ${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/'
+_MYSQL!= ${LOCALBASE}/bin/mysql_config --version | ${SED} -e 's/\([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/'
_PERCONA!= ${LOCALBASE}/bin/mysql --version | ${GREP} Percona | wc -l
_MARIADB!= ${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l
More information about the svn-ports-all
mailing list