From fa6babaaad0bfa2aeca4623483dca94dbc28272f Mon Sep 17 00:00:00 2001 From: mhei Date: Fri, 21 Oct 2011 20:58:46 +0000 Subject: [PATCH] [packages] php5: Introduce conditional dependencies Thanks jow for the suggestion. git-svn-id: svn://svn.openwrt.org/openwrt/packages@28509 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- lang/php5/Makefile | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/lang/php5/Makefile b/lang/php5/Makefile index b8f1d9f81..005f281d5 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php PKG_VERSION:=5.3.8 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.php.net/distributions/ @@ -491,43 +491,43 @@ $(eval $(call BuildPackage,php5-cgi)) $(eval $(call BuildPackage,php5-fastcgi)) #$(eval $(call BuildModule,NAME,TITLE[,PKG DEPENDS])) -$(eval $(call BuildModule,apc,APC,+librt)) +$(eval $(call BuildModule,apc,APC,+PACKAGE_php5-mod-apc:librt)) $(eval $(call BuildModule,ctype,Ctype)) -$(eval $(call BuildModule,curl,cURL,+libcurl)) -$(eval $(call BuildModule,fileinfo,Fileinfo,+libmagic)) +$(eval $(call BuildModule,curl,cURL,+PACKAGE_php5-mod-curl:libcurl)) +$(eval $(call BuildModule,fileinfo,Fileinfo,+PACKAGE_php5-mod-fileinfo:libmagic)) $(eval $(call BuildModule,dio,Direct IO)) -$(eval $(call BuildModule,dom,DOM,@PHP5_LIBXML +libxml2)) +$(eval $(call BuildModule,dom,DOM,@PHP5_LIBXML +PACKAGE_php5-mod-dom:libxml2)) $(eval $(call BuildModule,exif,EXIF)) $(eval $(call BuildModule,ftp,FTP)) -$(eval $(call BuildModule,gettext,Gettext,+libintl-full)) -$(eval $(call BuildModule,gd,GD graphics,+libgd)) -$(eval $(call BuildModule,gmp,GMP,+libgmp)) +$(eval $(call BuildModule,gettext,Gettext,+PACKAGE_php5-mod-gettext:libintl-full)) +$(eval $(call BuildModule,gd,GD graphics,+PACKAGE_php5-mod-gd:libgd)) +$(eval $(call BuildModule,gmp,GMP,+PACKAGE_php5-mod-gmp:libgmp)) $(eval $(call BuildModule,hash,Hash)) -$(eval $(call BuildModule,http,HTTP,+libcurl +librt)) -$(eval $(call BuildModule,iconv,iConv,+libiconv)) +$(eval $(call BuildModule,http,HTTP,+PACKAGE_php5-mod-http:libcurl +PACKAGE_php5-mod-http:librt)) +$(eval $(call BuildModule,iconv,iConv,+PACKAGE_php5-mod-iconv:libiconv)) $(eval $(call BuildModule,json,JSON)) -$(eval $(call BuildModule,ldap,LDAP,+libopenldap +libsasl2)) -$(eval $(call BuildModule,libevent,libevent,+libevent)) +$(eval $(call BuildModule,ldap,LDAP,+PACKAGE_php5-mod-ldap:libopenldap +PACKAGE_php5-mod-ldap:libsasl2)) +$(eval $(call BuildModule,libevent,libevent,+PACKAGE_php5-mod-libevent:libevent)) $(eval $(call BuildModule,mbstring,MBString)) -$(eval $(call BuildModule,mcrypt,Mcrypt,+libmcrypt +libltdl)) -$(eval $(call BuildModule,mysql,MySQL,+libmysqlclient)) -$(eval $(call BuildModule,openssl,OpenSSL,+libopenssl)) +$(eval $(call BuildModule,mcrypt,Mcrypt,+PACKAGE_php5-mod-mcrypt:libmcrypt +PACKAGE_php5-mod-mcrypt:libltdl)) +$(eval $(call BuildModule,mysql,MySQL,+PACKAGE_php5-mod-mysql:libmysqlclient)) +$(eval $(call BuildModule,openssl,OpenSSL,+PACKAGE_php5-mod-openssl:libopenssl)) $(eval $(call BuildModule,pcntl,PCNTL)) $(eval $(call BuildModule,pdo,PHP Data Objects)) -$(eval $(call BuildModule,pdo-mysql,PDO driver for MySQL,php5-mod-pdo +libmysqlclient)) -$(eval $(call BuildModule,pdo-pgsql,PDO driver for PostgreSQL,php5-mod-pdo +libpq)) -$(eval $(call BuildModule,pdo-sqlite,PDO driver for SQLite 3.x,php5-mod-pdo +libsqlite3 +libpthread)) -$(eval $(call BuildModule,pgsql,PostgreSQL,+libpq)) +$(eval $(call BuildModule,pdo-mysql,PDO driver for MySQL,+php5-mod-pdo +PACKAGE_php5-mod-pdo-mysql:libmysqlclient)) +$(eval $(call BuildModule,pdo-pgsql,PDO driver for PostgreSQL,+php5-mod-pdo +PACKAGE_php5-mod-pdo-pgsql:libpq)) +$(eval $(call BuildModule,pdo-sqlite,PDO driver for SQLite 3.x,+php5-mod-pdo +PACKAGE_php5-mod-pdo-sqlite:libsqlite3 +PACKAGE_php5-mod-pdo-sqlite:libpthread)) +$(eval $(call BuildModule,pgsql,PostgreSQL,+PACKAGE_php5-mod-pgsql:libpq)) $(eval $(call BuildModule,session,Session)) -$(eval $(call BuildModule,simplexml,SimpleXML,@PHP5_LIBXML +libxml2)) -$(eval $(call BuildModule,soap,SOAP,@PHP5_LIBXML +libxml2)) +$(eval $(call BuildModule,simplexml,SimpleXML,@PHP5_LIBXML +PACKAGE_php5-mod-simplexml:libxml2)) +$(eval $(call BuildModule,soap,SOAP,@PHP5_LIBXML +PACKAGE_php5-mod-soap:libxml2)) $(eval $(call BuildModule,sockets,Sockets)) -$(eval $(call BuildModule,sqlite,SQLite 2.x,+libsqlite2)) -$(eval $(call BuildModule,sqlite3,SQLite3,+libsqlite3 +libpthread)) +$(eval $(call BuildModule,sqlite,SQLite 2.x,+PACKAGE_php5-mod-sqlite:libsqlite2)) +$(eval $(call BuildModule,sqlite3,SQLite3,+PACKAGE_php5-mod-sqlite3:libsqlite3 +PACKAGE_php5-mod-sqlite3:libpthread)) $(eval $(call BuildModule,sysvmsg,System V messages)) $(eval $(call BuildModule,sysvsem,System V shared memory)) $(eval $(call BuildModule,sysvshm,System V semaphore)) $(eval $(call BuildModule,tokenizer,Tokenizer)) $(eval $(call BuildModule,xml,XML,+PHP5_LIBXML:libxml2 +!PHP5_LIBXML:libexpat)) -$(eval $(call BuildModule,xmlreader,XMLReader,@PHP5_LIBXML +libxml2 +libiconv)) -$(eval $(call BuildModule,xmlwriter,XMLWriter,@PHP5_LIBXML +libxml2 +libiconv)) +$(eval $(call BuildModule,xmlreader,XMLReader,@PHP5_LIBXML +PACKAGE_php5-mod-xmlreader:libxml2 +PACKAGE_php5-mod-xmlreader:libiconv)) +$(eval $(call BuildModule,xmlwriter,XMLWriter,@PHP5_LIBXML +PACKAGE_php5-mod-xmlwriter:libxml2 +PACKAGE_php5-mod-xmlwriter:libiconv)) -- 2.11.0