diff options
Diffstat (limited to 'package/php')
| -rw-r--r-- | package/php/Makefile | 27 | ||||
| -rw-r--r-- | package/php/files/php.init | 4 |
2 files changed, 13 insertions, 18 deletions
diff --git a/package/php/Makefile b/package/php/Makefile index 0af345f4c..0c6fd2389 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 7.4.11 +PKG_VERSION:= 8.3.11 PKG_RELEASE:= 1 -PKG_HASH:= 5d31675a9b9c21b5bd03389418218c30b26558246870caba8eb54f5856e2d6ce +PKG_HASH:= b862b098a08ab9bf4b36ed12c7d0d9f65353656b36fb0e3c5344093aceb35802 PKG_DESCR:= php language interpreter PKG_SECTION:= dev/lang PKG_NEEDS:= threads @@ -23,7 +23,7 @@ PKGSN_PHP_CLI:= php PKG_FLAVOURS_PHP:= MOD_BZ2 MOD_CURL MOD_FTP MOD_GD MOD_GMP MOD_MARIADB PKG_FLAVOURS_PHP+= MOD_SSL MOD_SESSION MOD_SNMP MOD_SQLITE -PKG_FLAVOURS_PHP+= MOD_SOCKETS MOD_XML MOD_SIMPLEXML MOD_ZLIB MOD_JSON +PKG_FLAVOURS_PHP+= MOD_SOCKETS MOD_XML MOD_SIMPLEXML MOD_ZLIB PKG_FLAVOURS_PHP+= MOD_LDAP MOD_PCNTL PKGFD_MOD_BZ2:= bzip2 support @@ -34,19 +34,20 @@ PKGFB_MOD_CURL:= curl PKGFS_MOD_CURL:= libcurl PKGFD_MOD_FTP:= ftp support PKGFD_MOD_GD:= gd support +PKGFB_MOD_GD:= libpng +PKGFS_MOD_GD:= libpng PKGFD_MOD_GMP:= gmp support PKGFB_MOD_GMP:= gmp PKGFS_MOD_GMP:= libgmp -PKGFD_MOD_JSON:= json support PKGFD_MOD_LDAP:= ldap support PKGFB_MOD_LDAP:= openldap PKGFS_MOD_LDAP:= libopenldap PKGFD_MOD_MARIADB:= mariadb support -PKGFS_MOD_MARIADB:= libmariadb +PKGFS_MOD_MARIADB:= libmariadbclient PKGFB_MOD_MARIADB:= mariadb PKGFD_MOD_SSL:= ssl support -PKGFB_MOD_SSL:= libressl -PKGFS_MOD_SSL:= libressl +PKGFB_MOD_SSL:= openssl +PKGFS_MOD_SSL:= libopenssl PKGFD_MOD_PCNTL:= process control support PKGFD_MOD_SESSION:= session support PKGFD_MOD_SNMP:= snmp support @@ -133,11 +134,6 @@ PKG_CONFIGURE_OPTS+= --with-gmp=shared,"$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --without-gmp endif -ifneq ($(ADK_PACKAGE_PHP_MOD_JSON),) -PKG_CONFIGURE_OPTS+= --enable-json=shared,"$(STAGING_TARGET_DIR)/usr" -else -PKG_CONFIGURE_OPTS+= --disable-json -endif ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),) PKG_CONFIGURE_OPTS+= --with-ldap=shared,"$(STAGING_TARGET_DIR)/usr" \ --with-ldap-sasl="$(STAGING_TARGET_DIR)/usr" @@ -146,6 +142,7 @@ PKG_CONFIGURE_OPTS+= --without-ldap endif ifneq ($(ADK_PACKAGE_PHP_MOD_MARIADB),) PKG_CONFIGURE_OPTS+= --with-pdo-mysql=shared,"$(STAGING_TARGET_DIR)/usr" +TARGET_CFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/mysql else PKG_CONFIGURE_OPTS+= --without-pdo-mysql endif @@ -190,9 +187,9 @@ else PKG_CONFIGURE_OPTS+= --disable-xml endif ifneq ($(ADK_PACKAGE_PHP_MOD_SIMPLEXML),) -PKG_CONFIGURE_OPTS+= --enable-simplexml=shared --enable-libxml +PKG_CONFIGURE_OPTS+= --enable-simplexml=shared else -PKG_CONFIGURE_OPTS+= --disable-simplexml --disable-libxml +PKG_CONFIGURE_OPTS+= --disable-simplexml endif ifneq ($(ADK_PACKAGE_PHP_MOD_ZLIB),) PKG_CONFIGURE_OPTS+= --with-zlib=shared,"$(STAGING_TARGET_DIR)/usr" @@ -205,7 +202,6 @@ $(eval $(call PKG_template,PHP_MOD_CURL,php-mod-curl,$(PKG_VERSION)-${PKG_RELEAS $(eval $(call PKG_template,PHP_MOD_FTP,php-mod-ftp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_GD,php-mod-gd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_GMP,php-mod-gmp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,PHP_MOD_JSON,php-mod-json,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_LDAP,php-mod-ldap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_MARIADB,php-mod-mariadb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_MOD_OPENSSL,php-mod-openssl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -222,7 +218,6 @@ $(eval $(call PKG_mod_template,PHP_MOD_CURL,curl)) $(eval $(call PKG_mod_template,PHP_MOD_FTP,ftp)) $(eval $(call PKG_mod_template,PHP_MOD_GD,gd)) $(eval $(call PKG_mod_template,PHP_MOD_GMP,gmp)) -$(eval $(call PKG_mod_template,PHP_MOD_JSON,json)) $(eval $(call PKG_mod_template,PHP_MOD_LDAP,ldap)) $(eval $(call PKG_mod_template,PHP_MOD_MARIADB,pdo_mysql)) $(eval $(call PKG_mod_template,PHP_MOD_OPENSSL,openssl)) diff --git a/package/php/files/php.init b/package/php/files/php.init index 5168bdd3e..a113500b6 100644 --- a/package/php/files/php.init +++ b/package/php/files/php.init @@ -16,14 +16,14 @@ start) if [ -x /usr/bin/php-cgi ];then /usr/bin/php-cgi -b /var/run/php5.sock & else - /usr/bin/php-fpm -D + /usr/bin/php -D fi ;; stop) if [ -x /usr/bin/php-cgi ];then pkill php-cgi else - pkill php-fpm + pkill php fi ;; restart) |