php: update to 8.0.0 (#6121)
This commit is contained in:
Arun
GitHub
parent
18d08d148a
commit
89e6517268
@ -1,11 +1,12 @@
|
||||
TERMUX_PKG_HOMEPAGE=https://php.net
|
||||
TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"
|
||||
TERMUX_PKG_LICENSE="PHP-3.0"
|
||||
TERMUX_PKG_VERSION=7.4.12
|
||||
TERMUX_PKG_VERSION=8.0.0
|
||||
TERMUX_PKG_SRCURL=https://github.com/php/php-src/archive/php-${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=a920b81cbfd866f2e686a2b8cc49e6e60a72c3e84e80851529d39e4c9c59e6b2
|
||||
TERMUX_PKG_SHA256=82d415f7b3912868ee68072e3f76f949fa8a73a6a9d763794055ef7aa637d935
|
||||
# Build native php for phar to build (see pear-Makefile.frag.patch):
|
||||
TERMUX_PKG_HOSTBUILD=true
|
||||
TERMUX_PKG_BLACKLISTED_ARCHES="x86_64"
|
||||
# Build the native php without xml support as we only need phar:
|
||||
TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="--disable-libxml --disable-dom --disable-simplexml --disable-xml --disable-xmlreader --disable-xmlwriter --without-pear --disable-sqlite3 --without-libxml --without-sqlite3 --without-pdo-sqlite"
|
||||
TERMUX_PKG_DEPENDS="freetype, libandroid-glob, libandroid-support, libbz2, libcrypt, libcurl, libgd, libgmp, libiconv, liblzma, libsqlite, libxml2, libxslt, libzip, oniguruma, openssl, pcre2, readline, zlib, libicu, libffi, tidy"
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
diff -u -r ../php-7.3.6/ext/opcache/config.m4 ./ext/opcache/config.m4
|
||||
--- ../php-7.3.6/ext/opcache/config.m4 2019-05-28 09:33:00.000000000 +0000
|
||||
+++ ./ext/opcache/config.m4 2019-06-24 20:40:39.725791000 +0000
|
||||
@@ -145,7 +145,9 @@
|
||||
diff -uNr php-8.0.0.orig/ext/opcache/config.m4 php-8.0.0/ext/opcache/config.m4
|
||||
--- php-8.0.0.orig/ext/opcache/config.m4 2020-11-24 22:34:03.000000000 +0530
|
||||
+++ php-8.0.0/ext/opcache/config.m4 2020-12-06 21:26:14.225669677 +0530
|
||||
@@ -219,7 +219,9 @@
|
||||
}
|
||||
]])],[dnl
|
||||
AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
|
||||
- msg=yes],[msg=no],[msg=no])
|
||||
+ msg=yes],[msg=no],
|
||||
- have_shm_mmap_anon=yes],[have_shm_mmap_anon=no],[have_shm_mmap_anon=no])
|
||||
+ have_shm_mmap_anon=yes],[have_shm_mmap_anon=no],
|
||||
+ AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
|
||||
+ msg=yes)
|
||||
AC_MSG_RESULT([$msg])
|
||||
+ have_shm_mmap_anon=yes)
|
||||
AC_MSG_RESULT([$have_shm_mmap_anon=yes])
|
||||
|
||||
AC_MSG_CHECKING(for mmap() using /dev/zero shared memory support)
|
||||
@@ -379,6 +381,9 @@
|
||||
Optimizer/zend_dump.c,
|
||||
PHP_CHECK_FUNC_LIB(shm_open, rt, root)
|
||||
@@ -336,6 +338,9 @@
|
||||
$ZEND_JIT_SRC,
|
||||
shared,,-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,,yes)
|
||||
|
||||
+ OPCACHE_SHARED_LIBADD=-lpcre2-8
|
||||
@ -21,4 +21,4 @@ diff -u -r ../php-7.3.6/ext/opcache/config.m4 ./ext/opcache/config.m4
|
||||
+
|
||||
PHP_ADD_BUILD_DIR([$ext_builddir/Optimizer], 1)
|
||||
PHP_ADD_EXTENSION_DEP(opcache, pcre)
|
||||
fi
|
||||
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
--- ./ext/iconv/config.m4.orig 2019-03-23 10:05:07.289878202 +0000
|
||||
+++ ./ext/iconv/config.m4 2019-03-23 10:06:27.207978972 +0000
|
||||
@@ -12,22 +12,6 @@
|
||||
])
|
||||
|
||||
if test "$iconv_avail" != "no"; then
|
||||
- if test -z "$ICONV_DIR"; then
|
||||
- for i in /usr/local /usr; do
|
||||
- if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
|
||||
- PHP_ICONV_PREFIX="$i"
|
||||
- break
|
||||
- fi
|
||||
- done
|
||||
- if test -z "$PHP_ICONV_PREFIX"; then
|
||||
- PHP_ICONV_PREFIX="/usr"
|
||||
- fi
|
||||
- else
|
||||
- PHP_ICONV_PREFIX="$ICONV_DIR"
|
||||
- fi
|
||||
-
|
||||
- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
|
||||
- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
|
||||
|
||||
if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then
|
||||
PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
|
||||
@ -1,6 +1,6 @@
|
||||
diff -uNr php-7.4.1/sapi/apache2handler/config.m4 php-7.4.1.mod/sapi/apache2handler/config.m4
|
||||
--- php-7.4.1/sapi/apache2handler/config.m4 2019-12-17 18:35:58.000000000 +0200
|
||||
+++ php-7.4.1.mod/sapi/apache2handler/config.m4 2020-01-02 01:08:05.368395459 +0200
|
||||
diff -uNr php-8.0.0.orig/sapi/apache2handler/config.m4 php-8.0.0/sapi/apache2handler/config.m4
|
||||
--- php-8.0.0.orig/sapi/apache2handler/config.m4 2020-11-24 22:34:03.000000000 +0530
|
||||
+++ php-8.0.0/sapi/apache2handler/config.m4 2020-12-06 22:10:55.658675537 +0530
|
||||
@@ -64,18 +64,9 @@
|
||||
fi
|
||||
|
||||
@ -8,24 +8,24 @@ diff -uNr php-7.4.1/sapi/apache2handler/config.m4 php-7.4.1.mod/sapi/apache2hand
|
||||
- if test -z `$APXS -q SYSCONFDIR`; then
|
||||
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
||||
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
||||
-i -n php7"
|
||||
-i -n php"
|
||||
- else
|
||||
- APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
|
||||
- INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
||||
- \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
|
||||
- $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
||||
- -S SYSCONFDIR='$APXS_SYSCONFDIR' \
|
||||
- -i -a -n php7"
|
||||
- -i -a -n php"
|
||||
- fi
|
||||
|
||||
case $host_alias in
|
||||
*aix*)
|
||||
@@ -100,6 +91,8 @@
|
||||
LIBPHP_CFLAGS="-shared"
|
||||
PHP_SUBST(LIBPHP_CFLAGS)
|
||||
@@ -103,6 +94,8 @@
|
||||
INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
|
||||
;;
|
||||
*)
|
||||
+ EXTRA_LDFLAGS="`$APR_CONFIG --ldflags --link-ld --libs`"
|
||||
+ EXTRA_LDFLAGS="`$APR_CONFIG --ldflags --link-ld --libs`"&
|
||||
+ EXTRA_LDFLAGS="`$APU_CONFIG --ldflags --link-ld --libs` $EXTRA_LDFLAGS"
|
||||
PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
|
||||
PHP_SELECT_SAPI(apache2handler, shared, mod_php.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
|
||||
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
|
||||
;;
|
||||
|
||||
@ -1,16 +1,18 @@
|
||||
--- sapi/cgi/cgi_main.c.orig 2020-01-19 21:52:00.467616255 +0000
|
||||
+++ ./sapi/cgi/cgi_main.c 2020-01-19 21:52:20.367984090 +0000
|
||||
@@ -84,7 +84,7 @@
|
||||
diff -uNr php-8.0.0.orig/sapi/cgi/cgi_main.c php-8.0.0/sapi/cgi/cgi_main.c
|
||||
--- php-8.0.0.orig/sapi/cgi/cgi_main.c 2020-11-24 22:34:03.000000000 +0530
|
||||
+++ php-8.0.0/sapi/cgi/cgi_main.c 2020-12-06 21:46:09.648909912 +0530
|
||||
@@ -83,7 +83,7 @@
|
||||
|
||||
#include "php_getopt.h"
|
||||
|
||||
-#include "fastcgi.h"
|
||||
+#include "../../main/fastcgi.h"
|
||||
#include "cgi_main_arginfo.h"
|
||||
|
||||
#if defined(PHP_WIN32) && defined(HAVE_OPENSSL)
|
||||
# include "openssl/applink.c"
|
||||
--- ./sapi/fpm/fpm/fpm_log.c.orig 2020-01-19 21:52:34.868252066 +0000
|
||||
+++ ./sapi/fpm/fpm/fpm_log.c 2020-01-19 21:53:28.639245436 +0000
|
||||
diff -uNr php-8.0.0.orig/sapi/fpm/fpm/fpm_log.c php-8.0.0/sapi/fpm/fpm/fpm_log.c
|
||||
--- php-8.0.0.orig/sapi/fpm/fpm/fpm_log.c 2020-11-24 22:34:03.000000000 +0530
|
||||
+++ php-8.0.0/sapi/fpm/fpm/fpm_log.c 2020-12-06 21:49:08.433333740 +0530
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "fpm_process_ctl.h"
|
||||
#include "fpm_signals.h"
|
||||
@ -20,9 +22,10 @@
|
||||
#include "zlog.h"
|
||||
|
||||
#ifdef MAX_LINE_LENGTH
|
||||
--- ./sapi/fpm/fpm/fpm_main.c.orig 2020-01-19 21:54:35.180473976 +0000
|
||||
+++ ./sapi/fpm/fpm/fpm_main.c 2020-01-19 21:54:47.060693226 +0000
|
||||
@@ -80,7 +80,7 @@
|
||||
diff -uNr php-8.0.0.orig/sapi/fpm/fpm/fpm_main.c php-8.0.0/sapi/fpm/fpm/fpm_main.c
|
||||
--- php-8.0.0.orig/sapi/fpm/fpm/fpm_main.c 2020-11-24 22:34:03.000000000 +0530
|
||||
+++ php-8.0.0/sapi/fpm/fpm/fpm_main.c 2020-12-06 21:47:59.656234130 +0530
|
||||
@@ -78,7 +78,7 @@
|
||||
|
||||
#include "http_status_codes.h"
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user