Date: Tue, 12 Dec 2017 08:06:02 -0800 From: "Philip M. Gollucci" <pgollucci@p6m7g8.com> To: Mahdi Mokhtari <mmokhi@freebsd.org> Cc: "ports-committers@freebsd.org" <ports-committers@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org> Subject: Re: svn commit: r450384 - head/Mk/Uses Message-ID: <CACM2dAb9Exj_bBYpFS4aTog9XeOWmg%2BYRBdOYe1_mfhpvup7vg@mail.gmail.com> In-Reply-To: <201709221528.v8MFS94Z011019@repo.freebsd.org> References: <201709221528.v8MFS94Z011019@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
is probably better written ad ${GREP} -c foo
On Fri, Sep 22, 2017 at 8:28 AM, Mahdi Mokhtari <mmokhi@freebsd.org> wrote:
> 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
>
> _______________________________________________
> svn-ports-all@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-ports-all
> To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
>
--
---------------------------------------------------------------------------------
4096R/D21D2752
<http://pgp.mit.edu/pks/lookup?op=get&search=0xF699A450D21D2752>; ECDF B597
B54B 7F92 753E E0EA F699 A450 D21D 2752
Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354
Member, Apache Software Foundation
Committer, FreeBSD Foundation
Consultant, P6M7G8 Inc.
Director Cloud Technology, Capital One
What doesn't kill us can only make us stronger;
Except it almost kills you.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACM2dAb9Exj_bBYpFS4aTog9XeOWmg%2BYRBdOYe1_mfhpvup7vg>