Date: Tue, 16 Feb 2016 15:38:22 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409000 - head/lang/php70 Message-ID: <201602161538.u1GFcMG3046930@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Tue Feb 16 15:38:21 2016 New Revision: 409000 URL: https://svnweb.freebsd.org/changeset/ports/409000 Log: - Fix mysql[nd] library handling in php modules logic. Reported by: fluffy Modified: head/lang/php70/Makefile head/lang/php70/Makefile.ext Modified: head/lang/php70/Makefile ============================================================================== --- head/lang/php70/Makefile Tue Feb 16 15:19:17 2016 (r408999) +++ head/lang/php70/Makefile Tue Feb 16 15:38:21 2016 (r409000) @@ -3,7 +3,7 @@ PORTNAME= php70 PORTVERSION= 7.0.3 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} Modified: head/lang/php70/Makefile.ext ============================================================================== --- head/lang/php70/Makefile.ext Tue Feb 16 15:19:17 2016 (r408999) +++ head/lang/php70/Makefile.ext Tue Feb 16 15:38:21 2016 (r409000) @@ -239,17 +239,6 @@ CONFIGURE_ARGS+=--with-pdo-firebird=${LO USES+= firebird USE_PHP= pdo USE_PHP_BUILD= yes - -.endif - -.if ${PHP_MODNAME} == "pdo_mysql" -CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd -USE_PHP=pdo -USE_PHP_BUILD= yes -.else -CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr -USE_MYSQL= yes .endif .if ${PHP_MODNAME} == "pdo_odbc" @@ -546,6 +535,19 @@ USE_MYSQL= yes . endif .endif +.if ${PHP_MODNAME} == "pdo_mysql" +USE_PHP=pdo +USE_PHP_BUILD= yes +. if ${PORT_OPTIONS:MMYSQLND} +CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd +USE_PHP+= mysqli +. else +CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ + --with-zlib-dir=/usr +USE_MYSQL= yes +. endif +.endif + .if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3" post-extract: @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602161538.u1GFcMG3046930>