diff --git a/lang/php7/Makefile b/lang/php7/Makefile index 6d2f6b565..99e98b3b9 100644 --- a/lang/php7/Makefile +++ b/lang/php7/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=7.2.5 -PKG_RELEASE:=2 +PKG_VERSION:=7.2.8 +PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold @@ -16,7 +16,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_HASH:=af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2 +PKG_HASH:=53ba0708be8a7db44256e3ae9fcecc91b811e5b5119e6080c951ffe7910ffb0f PKG_FIXUP:=libtool autoreconf PKG_BUILD_PARALLEL:=1 @@ -33,7 +33,7 @@ PHP7_MODULES = \ iconv imap intl \ json \ ldap \ - mbstring mysqli \ + mbstring mysqli mysqlnd \ opcache openssl \ pcntl pdo pdo-mysql pdo-pgsql pdo-sqlite pgsql phar \ session shmop simplexml snmp soap sockets sqlite3 sysvmsg sysvsem sysvshm \ @@ -74,7 +74,6 @@ define Package/php7/config config PHP7_SYSTEMTZDATA bool "Use system timezone data instead of php's built-in database" depends on PACKAGE_php7-cli || PACKAGE_php7-cgi - select PACKAGE_zoneinfo-core default y help Enabling this feature automatically selects the zoneinfo-core package @@ -86,7 +85,8 @@ define Package/php7 $(call Package/php7/Default) DEPENDS:=+libpcre +zlib \ - +PHP7_LIBXML:libxml2 + +PHP7_LIBXML:libxml2 \ + +PHP7_SYSTEMTZDATA:zoneinfo-core endef define Package/php7/description @@ -292,11 +292,17 @@ else endif ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-mysqli),) - CONFIGURE_ARGS+= --with-mysqli=shared,"$(STAGING_DIR)/usr/bin/mysql_config" + CONFIGURE_ARGS+= --with-mysqli=shared else CONFIGURE_ARGS+= --without-mysqli endif +ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-mysqlnd),) + CONFIGURE_ARGS+= --enable-mysqlnd=shared +else + CONFIGURE_ARGS+= --disable-mysqlnd +endif + ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-opcache),) CONFIGURE_ARGS+= --enable-opcache=shared else @@ -321,7 +327,7 @@ endif ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-pdo),) CONFIGURE_ARGS+= --enable-pdo=shared ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-pdo-mysql),) - CONFIGURE_ARGS+= --with-pdo-mysql=shared,"$(STAGING_DIR)/usr" + CONFIGURE_ARGS+= --with-pdo-mysql=shared else CONFIGURE_ARGS+= --without-pdo-mysql endif @@ -601,12 +607,13 @@ $(eval $(call BuildModule,intl,Internationalization Functions,+PACKAGE_php7-mod- $(eval $(call BuildModule,json,JSON)) $(eval $(call BuildModule,ldap,LDAP,+PACKAGE_php7-mod-ldap:libopenldap +PACKAGE_php7-mod-ldap:libsasl2)) $(eval $(call BuildModule,mbstring,MBString)) -$(eval $(call BuildModule,mysqli,MySQL Improved Extension,+PACKAGE_php7-mod-mysqli:libmysqlclient)) +$(eval $(call BuildModule,mysqli,MySQL Improved Extension,+PACKAGE_php7-mod-mysqli:php7-mod-mysqlnd,30)) +$(eval $(call BuildModule,mysqlnd,MySQL Native Driver)) $(eval $(call BuildModule,opcache,OPcache,,,zend)) $(eval $(call BuildModule,openssl,OpenSSL,+PACKAGE_php7-mod-openssl:libopenssl)) $(eval $(call BuildModule,pcntl,PCNTL)) $(eval $(call BuildModule,pdo,PHP Data Objects)) -$(eval $(call BuildModule,pdo-mysql,PDO driver for MySQL,+php7-mod-pdo +PACKAGE_php7-mod-pdo-mysql:libmysqlclient)) +$(eval $(call BuildModule,pdo-mysql,PDO driver for MySQL,+php7-mod-pdo +PACKAGE_php7-mod-pdo-mysql:php7-mod-mysqlnd)) $(eval $(call BuildModule,pdo-pgsql,PDO driver for PostgreSQL,+php7-mod-pdo +PACKAGE_php7-mod-pdo-pgsql:libpq)) $(eval $(call BuildModule,pdo-sqlite,PDO driver for SQLite 3.x,+php7-mod-pdo +PACKAGE_php7-mod-pdo-sqlite:libsqlite3 +PACKAGE_php7-mod-pdo-sqlite:librt)) $(eval $(call BuildModule,pgsql,PostgreSQL,+PACKAGE_php7-mod-pgsql:libpq))