Changeset 26870


Ignore:
Timestamp:
2011-05-10T23:10:16+02:00 (7 years ago)
Author:
mhei
Message:

[packages] php5: fix build and package dependencies

  • fix PKG_BUILD_DEPENDS (should finally close #9196)
  • correct package dependency spec as suggested by jow (refs #9368)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/lang/php5/Makefile

    r26847 r26870  
    1010PKG_NAME:=php 
    1111PKG_VERSION:=5.3.6 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    4040PKG_CONFIG_DEPENDS:= \ 
    4141        CONFIG_PACKAGE_php5-cgi CONFIG_PACKAGE_php5-cli \ 
    42         $(patsubst %,CONFIG_PACKAGE_%,$(PHP5_MODULES)) \ 
     42        $(patsubst %,CONFIG_PACKAGE_php5-mod-%,$(PHP5_MODULES)) \ 
    4343        CONFIG_PHP5_FILTER CONFIG_PHP5_LIBXML 
    4444 
     
    5353  URL:=http://www.php.net/ 
    5454  MAINTAINER:=Michael Heimpold <mhei@heimpold.de> 
     55  DEPENDS:=php5 
    5556endef 
    5657 
     
    7273define Package/php5 
    7374  $(call Package/php5/Default) 
    74   DEPENDS:=+libpcre +zlib 
    75   ifneq ($(CONFIG_PHP5_LIBXML),) 
    76     DEPENDS+= +libxml2 
    77   endif 
    78   ifneq ($(CONFIG_PACKAGE_php5-mod-apc),) 
    79     DEPENDS+= +librt 
    80   endif 
    81   ifneq ($(CONFIG_PACKAGE_php5-mod-sqlite3)$(CONFIG_PACKAGE_php5-mod-pdo-sqlite),) 
    82     DEPENDS+= +libsqlite3 +libpthread 
    83   endif 
     75 
     76  DEPENDS:=+libpcre +zlib \ 
     77           +PHP5_LIBXML:libxml2 \ 
     78           +PACKAGE_php5-mod-apc:librt \ 
     79           +(PACKAGE_php5-mod-sqlite3||PACKAGE_php5-mod-pdo-sqlite):libsqlite3 \ 
     80           +(PACKAGE_php5-mod-sqlite3||PACKAGE_php5-mod-pdo-sqlite):libpthread 
    8481endef 
    8582 
     
    9289define Package/php5-cli 
    9390  $(call Package/php5/Default) 
    94   DEPENDS:=php5 
    9591  TITLE+= (CLI) 
    9692endef 
     
    10399define Package/php5-cgi 
    104100  $(call Package/php5/Default) 
    105   DEPENDS:=php5 
    106101  TITLE+= (CGI & FastCGI) 
    107102endef 
     
    114109define Package/php5-fastcgi 
    115110  $(call Package/php5/Default) 
    116   DEPENDS:=php5 +php5-cgi 
     111  DEPENDS+= +php5-cgi 
    117112  TITLE:=FastCGI startup script 
    118113endef 
     
    453448  define Package/php5-mod-$(1) 
    454449    $(call Package/php5/Default) 
     450 
    455451    ifneq ($(3),) 
    456       DEPENDS:=$(3) 
    457     else 
    458       DEPENDS:=php5 
     452      DEPENDS+=$(3) 
    459453    endif 
     454 
    460455    TITLE:=$(2) shared module 
    461   endef 
    462  
    463   define Package/php5-mod-$(1)/config 
    464     depends on PACKAGE_php5-cli || PACKAGE_php5-cgi 
    465     $(4) 
    466456  endef 
    467457 
     
    482472$(eval $(call BuildPackage,php5-fastcgi)) 
    483473 
    484 #$(eval $(call BuildModule,NAME,TITLE[,PKG DEPENDS[,CONFIG DEPENDS]])) 
    485 $(eval $(call BuildModule,apc,APC)) 
     474#$(eval $(call BuildModule,NAME,TITLE[,PKG DEPENDS])) 
     475$(eval $(call BuildModule,apc,APC,+librt)) 
    486476$(eval $(call BuildModule,ctype,Ctype)) 
    487 $(eval $(call BuildModule,curl,cURL,php5 +libcurl)) 
    488 $(eval $(call BuildModule,fileinfo,Fileinfo,php5 +libmagic)) 
    489 $(eval $(call BuildModule,dom,DOM,php5 +libxml2,depends on PHP5_LIBXML)) 
     477$(eval $(call BuildModule,curl,cURL,+libcurl)) 
     478$(eval $(call BuildModule,fileinfo,Fileinfo,+libmagic)) 
     479$(eval $(call BuildModule,dom,DOM,@PHP5_LIBXML +libxml2)) 
    490480$(eval $(call BuildModule,exif,EXIF)) 
    491481$(eval $(call BuildModule,ftp,FTP)) 
    492 $(eval $(call BuildModule,gd,GD graphics,php5 +libgd)) 
    493 $(eval $(call BuildModule,gmp,GMP,php5 +libgmp)) 
     482$(eval $(call BuildModule,gd,GD graphics,+libgd)) 
     483$(eval $(call BuildModule,gmp,GMP,+libgmp)) 
    494484$(eval $(call BuildModule,hash,Hash)) 
    495 $(eval $(call BuildModule,iconv,iConv,php5 +libiconv)) 
     485$(eval $(call BuildModule,iconv,iConv,+libiconv)) 
    496486$(eval $(call BuildModule,json,JSON)) 
    497 $(eval $(call BuildModule,ldap,LDAP,php5 +libopenldap +libsasl2)) 
     487$(eval $(call BuildModule,ldap,LDAP,+libopenldap +libsasl2)) 
    498488$(eval $(call BuildModule,mbstring,MBString)) 
    499 $(eval $(call BuildModule,mcrypt,Mcrypt,php5 +libmcrypt +libltdl)) 
    500 $(eval $(call BuildModule,mysql,MySQL,php5 +libmysqlclient)) 
    501 $(eval $(call BuildModule,openssl,OpenSSL,php5 +libopenssl)) 
     489$(eval $(call BuildModule,mcrypt,Mcrypt,+libmcrypt +libltdl)) 
     490$(eval $(call BuildModule,mysql,MySQL,+libmysqlclient)) 
     491$(eval $(call BuildModule,openssl,OpenSSL,+libopenssl)) 
    502492$(eval $(call BuildModule,pcntl,PCNTL)) 
    503493$(eval $(call BuildModule,pdo,PHP Data Objects)) 
     
    505495$(eval $(call BuildModule,pdo-pgsql,PDO driver for PostgreSQL,php5-mod-pdo +libpq)) 
    506496$(eval $(call BuildModule,pdo-sqlite,PDO driver for SQLite 3.x,php5-mod-pdo +libsqlite3 +libpthread)) 
    507 $(eval $(call BuildModule,pgsql,PostgreSQL,php5 +libpq)) 
     497$(eval $(call BuildModule,pgsql,PostgreSQL,+libpq)) 
    508498$(eval $(call BuildModule,session,Session)) 
    509 $(eval $(call BuildModule,simplexml,SimpleXML,php5 +libxml2,depends on PHP5_LIBXML)) 
    510 $(eval $(call BuildModule,soap,SOAP,php5 +libxml2,depends on PHP5_LIBXML)) 
     499$(eval $(call BuildModule,simplexml,SimpleXML,@PHP5_LIBXML +libxml2)) 
     500$(eval $(call BuildModule,soap,SOAP,@PHP5_LIBXML +libxml2)) 
    511501$(eval $(call BuildModule,sockets,Sockets)) 
    512 $(eval $(call BuildModule,sqlite,SQLite 2.x,php5 +libsqlite2)) 
    513 $(eval $(call BuildModule,sqlite3,SQLite3,php5 +libsqlite3 +libpthread)) 
     502$(eval $(call BuildModule,sqlite,SQLite 2.x,+libsqlite2)) 
     503$(eval $(call BuildModule,sqlite3,SQLite3,+libsqlite3 +libpthread)) 
    514504$(eval $(call BuildModule,sysvmsg,System V messages)) 
    515505$(eval $(call BuildModule,sysvsem,System V shared memory)) 
    516506$(eval $(call BuildModule,sysvshm,System V semaphore)) 
    517507$(eval $(call BuildModule,tokenizer,Tokenizer)) 
    518 $(eval $(call BuildModule,xml,XML,php5 $(if $(CONFIG_PHP5_LIBXML),+libxml2,+libexpat))) 
    519 $(eval $(call BuildModule,xmlreader,XMLReader,php5 +libxml2 +libiconv,depends on PHP5_LIBXML)) 
    520 $(eval $(call BuildModule,xmlwriter,XMLWriter,php5 +libxml2 +libiconv,depends on PHP5_LIBXML)) 
     508$(eval $(call BuildModule,xml,XML,+PHP5_LIBXML:libxml2 +!PHP5_LIBXML:libexpat)) 
     509$(eval $(call BuildModule,xmlreader,XMLReader,@PHP5_LIBXML +libxml2 +libiconv)) 
     510$(eval $(call BuildModule,xmlwriter,XMLWriter,@PHP5_LIBXML +libxml2 +libiconv)) 
Note: See TracChangeset for help on using the changeset viewer.