From owner-svn-ports-all@freebsd.org Thu Jan 17 10:11:44 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E233B148D847; Thu, 17 Jan 2019 10:11:43 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8998B85E45; Thu, 17 Jan 2019 10:11:43 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A1F1189B2; Thu, 17 Jan 2019 10:11:43 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0HABh19015765; Thu, 17 Jan 2019 10:11:43 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0HABhHj015764; Thu, 17 Jan 2019 10:11:43 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201901171011.x0HABhHj015764@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Thu, 17 Jan 2019 10:11:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490539 - head/lang/php71 X-SVN-Group: ports-head X-SVN-Commit-Author: tz X-SVN-Commit-Paths: head/lang/php71 X-SVN-Commit-Revision: 490539 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8998B85E45 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2019 10:11:44 -0000 Author: tz Date: Thu Jan 17 10:11:42 2019 New Revision: 490539 URL: https://svnweb.freebsd.org/changeset/ports/490539 Log: lang/php71: 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 Modified: head/lang/php71/Makefile head/lang/php71/pkg-plist Modified: head/lang/php71/Makefile ============================================================================== --- head/lang/php71/Makefile Thu Jan 17 10:02:46 2019 (r490538) +++ head/lang/php71/Makefile Thu Jan 17 10:11:42 2019 (r490539) @@ -3,7 +3,7 @@ PORTNAME= php71 PORTVERSION= 7.1.26 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} @@ -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} \ --program-prefix="" @@ -35,8 +34,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 MAILHEAD LINKTHR ZTS -OPTIONS_DEFAULT=CLI CGI FPM EMBED LINKTHR DTRACE +OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD 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 @@ FPM_DESC= Build FPM version EMBED_DESC= Build embedded library PHPDBG_DESC= Interactive PHP debugger MAILHEAD_DESC= Enable mail header patch +MYSQL_DESC= Build with MySQL Native Driver LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build @@ -69,6 +69,10 @@ PATCH_DIST_STRIP= -p1 .if ${PORT_OPTIONS:MMAILHEAD} PATCHFILES+= php-7.1.x-mail-header.patch:mail PATCH_SITES+= http://choon.net/opensource/php/:mail +.endif + +.if ${PORT_OPTIONS:MMYSQL} +CONFIGURE_ARGS+=--enable-mysqlnd .endif .if ${PORT_OPTIONS:MCLI} Modified: head/lang/php71/pkg-plist ============================================================================== --- head/lang/php71/pkg-plist Thu Jan 17 10:02:46 2019 (r490538) +++ head/lang/php71/pkg-plist Thu Jan 17 10:11:42 2019 (r490539) @@ -92,33 +92,33 @@ include/php/ext/date/lib/timelib_config.h include/php/ext/date/lib/timelib_structs.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