Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Jan 2019 10:30:55 +0000 (UTC)
From:      Torsten Zuehlsdorff <tz@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r490541 - head/lang/php72
Message-ID:  <201901171030.x0HAUtwM024753@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tz
Date: Thu Jan 17 10:30:54 2019
New Revision: 490541
URL: https://svnweb.freebsd.org/changeset/ports/490541

Log:
  lang/php72: Make enabling MYSQL native driver optional
  
  Currently PHP is always compiled with --enable-mysqlnd, to allow the use
  of the native MySQL Native Driver. MySQL Native Driver is a replacement for the
  MySQL Client Library.
  
  While this is handy when working with MySQL there is no need for
  it when MySQL is *not* used at all. This happens frequently when
  working without databases or simply with other databases.
  
  To avoid POLA the newly introduced option is a default option.
  
  Disabling it will reduce the size of the package by ca. 175 KB,
  which also helps in modern constraint VM run environments.
  
  Submitted by:	Reko Turja <reko.turja@liukuma.net>

Modified:
  head/lang/php72/Makefile
  head/lang/php72/pkg-plist

Modified: head/lang/php72/Makefile
==============================================================================
--- head/lang/php72/Makefile	Thu Jan 17 10:21:06 2019	(r490540)
+++ head/lang/php72/Makefile	Thu Jan 17 10:30:54 2019	(r490541)
@@ -2,7 +2,7 @@
 
 PORTNAME=	php72
 DISTVERSION=	7.2.14
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}
@@ -25,7 +25,6 @@ CONFIGURE_ARGS+=--with-layout=GNU \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
 		--enable-libxml \
-		--enable-mysqlnd \
 		--with-libxml-dir=${LOCALBASE} \
 		--with-pcre-regex=${LOCALBASE} \
 		--with-password-argon2=${LOCALBASE} \
@@ -36,8 +35,8 @@ USE_GNOME=	libxml2
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-z,notext
 
-OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 LINKTHR ZTS
-OPTIONS_DEFAULT=CLI CGI FPM EMBED LINKTHR DTRACE
+OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQL LINKTHR ZTS
+OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQL LINKTHR DTRACE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
@@ -55,6 +54,7 @@ CGI_DESC=	Build CGI version
 FPM_DESC=	Build FPM version
 EMBED_DESC=	Build embedded library
 PHPDBG_DESC=	Interactive PHP debugger
+MYSQL_DESC=	Build with MySQL Native Driver
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
@@ -63,6 +63,10 @@ CONFLICTS=	php56-* php70-* php71-* php73-*
 DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MMYSQL}
+CONFIGURE_ARGS+=--enable-mysqlnd
+.endif
 
 .if ${PORT_OPTIONS:MCLI}
 PHP_SAPI+=	cli

Modified: head/lang/php72/pkg-plist
==============================================================================
--- head/lang/php72/pkg-plist	Thu Jan 17 10:21:06 2019	(r490540)
+++ head/lang/php72/pkg-plist	Thu Jan 17 10:30:54 2019	(r490541)
@@ -92,33 +92,33 @@ include/php/ext/date/lib/timelib.h
 include/php/ext/date/lib/timelib_config.h
 include/php/ext/date/php_date.h
 include/php/ext/libxml/php_libxml.h
-include/php/ext/mysqlnd/config-win.h
-include/php/ext/mysqlnd/mysql_float_to_double.h
-include/php/ext/mysqlnd/mysqlnd.h
-include/php/ext/mysqlnd/mysqlnd_alloc.h
-include/php/ext/mysqlnd/mysqlnd_auth.h
-include/php/ext/mysqlnd/mysqlnd_block_alloc.h
-include/php/ext/mysqlnd/mysqlnd_charset.h
-include/php/ext/mysqlnd/mysqlnd_commands.h
-include/php/ext/mysqlnd/mysqlnd_connection.h
-include/php/ext/mysqlnd/mysqlnd_debug.h
-include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
-include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
-include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
-include/php/ext/mysqlnd/mysqlnd_plugin.h
-include/php/ext/mysqlnd/mysqlnd_portability.h
-include/php/ext/mysqlnd/mysqlnd_priv.h
-include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
-include/php/ext/mysqlnd/mysqlnd_ps.h
-include/php/ext/mysqlnd/mysqlnd_read_buffer.h
-include/php/ext/mysqlnd/mysqlnd_result.h
-include/php/ext/mysqlnd/mysqlnd_result_meta.h
-include/php/ext/mysqlnd/mysqlnd_reverse_api.h
-include/php/ext/mysqlnd/mysqlnd_statistics.h
-include/php/ext/mysqlnd/mysqlnd_structs.h
-include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
-include/php/ext/mysqlnd/mysqlnd_vio.h
-include/php/ext/mysqlnd/php_mysqlnd.h
+%%MYSQL%%include/php/ext/mysqlnd/config-win.h
+%%MYSQL%%include/php/ext/mysqlnd/mysql_float_to_double.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_alloc.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_auth.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_block_alloc.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_charset.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_commands.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_connection.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_debug.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_plugin.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_portability.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_priv.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_ps.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_read_buffer.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_result.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_result_meta.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_reverse_api.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_statistics.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_structs.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
+%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_vio.h
+%%MYSQL%%include/php/ext/mysqlnd/php_mysqlnd.h
 include/php/ext/pcre/php_pcre.h
 include/php/ext/spl/php_spl.h
 include/php/ext/spl/spl_array.h



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901171030.x0HAUtwM024753>