From 45fedef51112c6006a85be3a5c020567ee6a1ac2 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Thu, 1 Jan 2015 23:57:43 +0100 Subject: [PATCH] php5: fix iconv dependency Signed-off-by: Michael Heimpold --- lang/php5/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 8c45d9dbe..0682aadff 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2014 OpenWrt.org +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php PKG_VERSION:=5.4.36 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_MAINTAINER:=W. Michael Petullo @@ -509,7 +509,7 @@ $(eval $(call BuildModule,gettext,Gettext,+PACKAGE_php5-mod-gettext:libintl-full $(eval $(call BuildModule,gd,GD graphics,+PACKAGE_php5-mod-gd:libjpeg +PACKAGE_php5-mod-gd:libpng)) $(eval $(call BuildModule,gmp,GMP,+PACKAGE_php5-mod-gmp:libgmp)) $(eval $(call BuildModule,hash,Hash)) -$(eval $(call BuildModule,iconv,iConv,+PACKAGE_php5-mod-iconv:libiconv)) +$(eval $(call BuildModule,iconv,iConv,$(ICONV_DEPENDS))) $(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))