svn commit: r512437 - head/lang/php74/files
Torsten Zuehlsdorff
tz at FreeBSD.org
Fri Sep 20 19:50:08 UTC 2019
Author: tz
Date: Fri Sep 20 19:50:07 2019
New Revision: 512437
URL: https://svnweb.freebsd.org/changeset/ports/512437
Log:
lang/php74: fix the broken patches
The same error cause from r512431 caused some patches missing or undeleted.
Now commit the missing changes in order to unbreak PHP.
Sponsored by: PHP Update Service
Added:
head/lang/php74/files/patch-build_Makefile.global
- copied, changed from r512436, head/lang/php74/files/patch-Makefile.global
head/lang/php74/files/patch-configure.ac
- copied, changed from r512436, head/lang/php74/files/patch-configure.in
Deleted:
head/lang/php74/files/patch-Makefile.global
head/lang/php74/files/patch-acinclude.m4
head/lang/php74/files/patch-configure.in
Copied and modified: head/lang/php74/files/patch-build_Makefile.global (from r512436, head/lang/php74/files/patch-Makefile.global)
==============================================================================
--- head/lang/php74/files/patch-Makefile.global Fri Sep 20 19:48:00 2019 (r512436, copy source)
+++ head/lang/php74/files/patch-build_Makefile.global Fri Sep 20 19:50:07 2019 (r512437)
@@ -1,5 +1,5 @@
---- Makefile.global.orig 2016-08-17 19:50:48 UTC
-+++ Makefile.global
+--- 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`; \
Copied and modified: head/lang/php74/files/patch-configure.ac (from r512436, head/lang/php74/files/patch-configure.in)
==============================================================================
--- head/lang/php74/files/patch-configure.in Fri Sep 20 19:48:00 2019 (r512436, copy source)
+++ head/lang/php74/files/patch-configure.ac Fri Sep 20 19:50:07 2019 (r512437)
@@ -1,47 +1,31 @@
---- configure.ac.orig 2018-01-02 22:35:55 UTC
+--- configure.ac.orig 2019-08-06 06:54:06 UTC
+++ configure.ac
-@@ -102,6 +102,7 @@ int zend_sprintf(char *buffer, const char *format, ...
+@@ -105,6 +105,7 @@ extern "C++" {
+ #endif
+ #endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
- #undef PTHREADS
-
+#include <ext/php_config.h>
#endif /* PHP_CONFIG_H */
])
-@@ -339,7 +340,6 @@ sinclude(TSRM/tsrm.m4)
- dnl .
- dnl -------------------------------------------------------------------------
+@@ -313,7 +314,6 @@ sinclude(Zend/Zend.m4)
+ dnl ----------------------------------------------------------------------------
+
-PTHREADS_CHECK
PHP_HELP_SEPARATOR([SAPI modules:])
PHP_SHLIB_SUFFIX_NAMES
PHP_BUILD_PROGRAM
-@@ -370,15 +370,9 @@ else
- AC_MSG_RESULT([none])
- fi
+@@ -654,7 +654,7 @@ memmem \
+ AX_FUNC_WHICH_GETHOSTBYNAME_R
--dnl Exit early
--if test -z "$PHP_INSTALLED_SAPIS"; then
-- AC_MSG_ERROR([Nothing to build.])
--fi
--
- dnl force ZTS
- if test "$enable_maintainer_zts" = "yes"; then
- PTHREADS_ASSIGN_VARS
-- PTHREADS_FLAGS
- fi
-
- dnl Starting system checks.
-@@ -682,7 +676,7 @@ nanosleep \
- )
-
- dnl Some systems (like OpenSolaris) do not have nanosleep in libc
+ dnl Some systems (like OpenSolaris) do not have nanosleep in libc.
-PHP_CHECK_FUNC_LIB(nanosleep, rt)
+PHP_CHECK_FUNC(nanosleep, rt)
- dnl Check for getaddrinfo, should be a better way, but...
- dnl Also check for working getaddrinfo
-@@ -1235,7 +1229,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
+ dnl Check for getaddrinfo, should be a better way, but... Also check for working
+ dnl getaddrinfo.
+@@ -1308,7 +1308,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
EXPANDED_DATADIR=$datadir
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
@@ -50,12 +34,12 @@
exec_prefix=$old_exec_prefix
libdir=$old_libdir
-@@ -1434,7 +1428,7 @@ PHP_SUBST(all_targets)
+@@ -1493,7 +1493,7 @@ PHP_SUBST(all_targets)
PHP_SUBST(install_targets)
PHP_SUBST(install_binary_targets)
-PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/])
- PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+ PHP_ADD_SOURCES(TSRM, TSRM.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
More information about the svn-ports-all
mailing list