Date: Thu, 1 Sep 2016 14:14:44 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421225 - in head/lang: php55 php55/files php56 php56/files php70 php70/files Message-ID: <201609011414.u81EEiiR001915@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Sep 1 14:14:44 2016 New Revision: 421225 URL: https://svnweb.freebsd.org/changeset/ports/421225 Log: Fix running make test for php extensions (and maybe php itself) With the default configuration, all the directives are removed from with egrep. Then, egrep, seeing that it does not output any line, will exit(1). With hat: portmgr Sponsored by: Absolight Added: head/lang/php55/files/patch-Makefile.global (contents, props changed) head/lang/php56/files/patch-Makefile.global (contents, props changed) head/lang/php70/files/patch-Makefile.global (contents, props changed) Modified: head/lang/php55/Makefile (contents, props changed) head/lang/php56/Makefile (contents, props changed) head/lang/php70/Makefile (contents, props changed) Modified: head/lang/php55/Makefile ============================================================================== --- head/lang/php55/Makefile Thu Sep 1 14:14:30 2016 (r421224) +++ head/lang/php55/Makefile Thu Sep 1 14:14:44 2016 (r421225) @@ -3,7 +3,7 @@ PORTNAME= php55 PORTVERSION= 5.5.38 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} Added: head/lang/php55/files/patch-Makefile.global ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/php55/files/patch-Makefile.global Thu Sep 1 14:14:44 2016 (r421225) @@ -0,0 +1,19 @@ +--- Makefile.global.orig 2016-07-20 08:41:48 UTC ++++ Makefile.global +@@ -89,14 +89,14 @@ test: all + @if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ + INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \ + if test "$$INI_FILE"; then \ +- $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ ++ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini || :; \ + else \ + echo > $(top_builddir)/tmp-php.ini; \ + fi; \ + INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \ + if test "$$INI_SCANNED_PATH"; then \ + INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \ +- $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \ ++ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini || :; \ + fi; \ + TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ + TEST_PHP_SRCDIR=$(top_srcdir) \ Modified: head/lang/php56/Makefile ============================================================================== --- head/lang/php56/Makefile Thu Sep 1 14:14:30 2016 (r421224) +++ head/lang/php56/Makefile Thu Sep 1 14:14:44 2016 (r421225) @@ -3,7 +3,7 @@ PORTNAME= php56 PORTVERSION= 5.6.25 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} Added: head/lang/php56/files/patch-Makefile.global ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/php56/files/patch-Makefile.global Thu Sep 1 14:14:44 2016 (r421225) @@ -0,0 +1,19 @@ +--- Makefile.global.orig 2016-08-18 11:07:46 UTC ++++ Makefile.global +@@ -89,14 +89,14 @@ test: all + @if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ + INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \ + if test "$$INI_FILE"; then \ +- $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ ++ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini || :; \ + else \ + echo > $(top_builddir)/tmp-php.ini; \ + fi; \ + INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \ + if test "$$INI_SCANNED_PATH"; then \ + INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \ +- $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \ ++ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini || :; \ + fi; \ + TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ + TEST_PHP_SRCDIR=$(top_srcdir) \ Modified: head/lang/php70/Makefile ============================================================================== --- head/lang/php70/Makefile Thu Sep 1 14:14:30 2016 (r421224) +++ head/lang/php70/Makefile Thu Sep 1 14:14:44 2016 (r421225) @@ -3,7 +3,7 @@ PORTNAME= php70 PORTVERSION= 7.0.10 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} Added: head/lang/php70/files/patch-Makefile.global ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/php70/files/patch-Makefile.global Thu Sep 1 14:14:44 2016 (r421225) @@ -0,0 +1,19 @@ +--- Makefile.global.orig 2016-08-17 19:50:48 UTC ++++ Makefile.global +@@ -89,14 +89,14 @@ test: all + @if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ + INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \ + if test "$$INI_FILE"; then \ +- $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ ++ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini || :; \ + else \ + echo > $(top_builddir)/tmp-php.ini; \ + fi; \ + INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \ + if test "$$INI_SCANNED_PATH"; then \ + INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \ +- $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \ ++ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini || :; \ + fi; \ + TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ + TEST_PHP_SRCDIR=$(top_srcdir) \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609011414.u81EEiiR001915>