diff --git a/lang/php5/Makefile b/lang/php5/Makefile index a8cbce2fc..8b2cd45fe 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php PKG_VERSION:=5.6.19 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=W. Michael Petullo , Michael Heimpold @@ -32,7 +32,7 @@ PHP5_MODULES = \ ftp \ gettext gd gmp \ hash \ - iconv \ + iconv intl \ json \ ldap \ mbstring mcrypt mysql mysqli \ @@ -98,6 +98,7 @@ endef define Package/php5-cli $(call Package/php5/Default) + DEPENDS+= +PACKAGE_php5-mod-intl:libstdcpp TITLE+= (CLI) endef @@ -108,6 +109,7 @@ endef define Package/php5-cgi $(call Package/php5/Default) + DEPENDS+= +PACKAGE_php5-mod-intl:libstdcpp TITLE+= (CGI & FastCGI) endef @@ -237,6 +239,12 @@ else CONFIGURE_ARGS+= --without-iconv endif +ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-intl),) + CONFIGURE_ARGS+= --enable-intl=shared +else + CONFIGURE_ARGS+= --disable-intl +endif + ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-json),) CONFIGURE_ARGS+= --enable-json=shared else @@ -543,6 +551,7 @@ $(eval $(call BuildModule,gettext,Gettext,+PACKAGE_php5-mod-gettext:libintl-full $(eval $(call BuildModule,gmp,GMP,+PACKAGE_php5-mod-gmp:libgmp)) $(eval $(call BuildModule,hash,Hash)) $(eval $(call BuildModule,iconv,iConv,$(ICONV_DEPENDS))) +$(eval $(call BuildModule,intl,Internationalization Functions,+PACKAGE_php5-mod-intl:icu)) $(eval $(call BuildModule,json,JSON)) $(eval $(call BuildModule,ldap,LDAP,+PACKAGE_php5-mod-ldap:libopenldap +PACKAGE_php5-mod-ldap:libsasl2)) $(eval $(call BuildModule,mbstring,MBString))