Changeset View
Changeset View
Standalone View
Standalone View
lang/php80/files/patch-build_Makefile.global
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| --- build/Makefile.global.orig 2019-08-06 06:54:07 UTC | |||||
| +++ build/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) \ | |||||