diff options
Diffstat (limited to 'package/php/Makefile')
-rw-r--r-- | package/php/Makefile | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/package/php/Makefile b/package/php/Makefile index ad956ab9f..7b9a1e81b 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 7.0.27 +PKG_VERSION:= 8.3.2 PKG_RELEASE:= 1 -PKG_HASH:= 4b2bc823e806dbf7b62fe0b92b0d14b0c6e03f88c3fc5d96278416c54ce11f6c +PKG_HASH:= 4ffa3e44afc9c590e28dc0d2d31fc61f0139f8b335f11880a121b9f9b9f0634e 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,17 +34,14 @@ PKGFB_MOD_CURL:= curl PKGFS_MOD_CURL:= libcurl PKGFD_MOD_FTP:= ftp support PKGFD_MOD_GD:= gd support -PKGFB_MOD_GD:= libgd libpng libjpeg-turbo libXpm -PKGFS_MOD_GD:= libgd libpng libjpeg-turbo libxpm 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 @@ -92,7 +89,6 @@ PKG_CONFIGURE_OPTS:= \ --enable-cgi \ --enable-fpm \ --enable-opcache=no \ - --disable-hash \ --disable-mbstring \ --disable-mbregex \ --disable-phar \ @@ -109,7 +105,6 @@ PKG_CONFIGURE_OPTS:= \ --without-gettext \ --without-pgsql \ --without-iconv \ - --with-pcre-regex=no \ --with-kerberos=no ifneq ($(ADK_PACKAGE_PHP_MOD_BZ2),) @@ -128,26 +123,15 @@ else PKG_CONFIGURE_OPTS+= --disable-ftp endif ifneq ($(ADK_PACKAGE_PHP_MOD_GD),) -PKG_CONFIGURE_OPTS+= --with-gd=shared,"$(STAGING_TARGET_DIR)/usr" \ - --with-png-dir="$(STAGING_TARGET_DIR)/usr" \ - --with-jpeg-dir="$(STAGING_TARGET_DIR)/usr" \ - --without-freetype-dir \ - --without-t1lib \ - --enable-gd-native-ttf \ - --disable-gd-jis-conv +PKG_CONFIGURE_OPTS+= --enable-gd=shared else -PKG_CONFIGURE_OPTS+= --without-gd +PKG_CONFIGURE_OPTS+= --disable-gd endif ifneq ($(ADK_PACKAGE_PHP_MOD_GMP),) 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" @@ -156,6 +140,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 @@ -200,9 +185,9 @@ else PKG_CONFIGURE_OPTS+= --disable-xml endif ifneq ($(ADK_PACKAGE_PHP_MOD_SIMPLEXML),) -PKG_CONFIGURE_OPTS+= --enable-simplexml=shared --enable-libxml --with-libxml-dir="$(STAGING_TARGET_DIR)/usr" +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" @@ -215,7 +200,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})) @@ -232,7 +216,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)) |