enable all packages when DEVELOPER=1, add curl and gmp extensions, fix gd extension build

SVN-Revision: 1948
This commit is contained in:
Nicolas Thill 2005-09-19 23:06:12 +00:00
parent f5ab7b925c
commit 0622dd7a25
5 changed files with 73 additions and 15 deletions

View File

@ -293,9 +293,15 @@ openvpn-compile: lzo-compile
endif
php4-compile: openssl-compile zlib-compile
ifneq ($(BR2_PACKAGE_PHP4_MOD_CURL),)
php4-compile: curl-compile
endif
ifneq ($(BR2_PACKAGE_PHP4_MOD_GD),)
php4-compile: libgd-compile libpng-compile
endif
ifneq ($(BR2_PACKAGE_PHP4_MOD_GMP),)
php4-compile: gmp-compile
endif
ifneq ($(BR2_PACKAGE_PHP4_MOD_LDAP),)
php4-compile: openldap-compile
endif

View File

@ -10,7 +10,7 @@ comment "Server API --"
config BR2_PACKAGE_PHP4_CLI
prompt "...-cli - PHP4 CLI (Command Line Interface)"
tristate
# default m if CONFIG_DEVEL
default m if CONFIG_DEVEL
select BR2_COMPILE_PHP4
select BR2_PACKAGE_LIBOPENSSL
select BR2_PACKAGE_ZLIB
@ -23,7 +23,7 @@ config BR2_PACKAGE_PHP4_CLI
config BR2_PACKAGE_PHP4_CGI
prompt "...-cgi - PHP4 built for CGI"
tristate
# default m if CONFIG_DEVEL
default m if CONFIG_DEVEL
select BR2_COMPILE_PHP4
select BR2_PACKAGE_LIBOPENSSL
select BR2_PACKAGE_ZLIB
@ -36,7 +36,7 @@ config BR2_PACKAGE_PHP4_CGI
config BR2_PACKAGE_PHP4_FASTCGI
prompt "...-fastcgi - PHP4 built for FastCGI"
tristate
# default m if CONFIG_DEVEL
default m if CONFIG_DEVEL
select BR2_COMPILE_PHP4
select BR2_PACKAGE_LIBOPENSSL
select BR2_PACKAGE_ZLIB
@ -48,78 +48,92 @@ config BR2_PACKAGE_PHP4_FASTCGI
comment "Extensions --"
config BR2_PACKAGE_PHP4_MOD_CURL
prompt "...-mod-curl - cURL module"
tristate
default m if CONFIG_DEVEL
depends BR2_COMPILE_PHP4
select BR2_PACKAGE_LIBCURL
config BR2_PACKAGE_PHP4_MOD_FTP
prompt "...-mod-ftp - FTP module"
tristate
# default m if CONFIG_DEVEL
default m if CONFIG_DEVEL
depends BR2_COMPILE_PHP4
config BR2_PACKAGE_PHP4_MOD_GD
prompt "...-mod-gd - GD graphics library module"
tristate
# default m if CONFIG_DEVEL
default m if CONFIG_DEVEL
depends BR2_COMPILE_PHP4
select BR2_PACKAGE_LIBGD
select BR2_PACKAGE_LIBPNG
config BR2_PACKAGE_PHP4_MOD_GMP
prompt "...-mod-gmp - GMP module"
tristate
default m if CONFIG_DEVEL
depends BR2_COMPILE_PHP4
select BR2_PACKAGE_LIBGMP
config BR2_PACKAGE_PHP4_MOD_LDAP
prompt "...-mod-ldap - LDAP module"
tristate
# default m if CONFIG_DEVEL
default m if CONFIG_DEVEL
depends BR2_COMPILE_PHP4
select BR2_PACKAGE_LIBOPENLDAP
config BR2_PACKAGE_PHP4_MOD_MYSQL
prompt "...-mod-mysql - MySQL module"
tristate
# default m if CONFIG_DEVEL
default m if CONFIG_DEVEL
depends BR2_COMPILE_PHP4
select BR2_PACKAGE_LIBMYSQLCLIENT
config BR2_PACKAGE_PHP4_MOD_OPENSSL
prompt "...-mod-openssl - OpenSSL module"
tristate
# default m if CONFIG_DEVEL
default m if CONFIG_DEVEL
depends BR2_COMPILE_PHP4
select BR2_PACKAGE_LIBOPENSSL
config BR2_PACKAGE_PHP4_MOD_PCRE
prompt "...-mod-pcre - PCRE module"
tristate
# default m if CONFIG_DEVEL
default m if CONFIG_DEVEL
depends BR2_COMPILE_PHP4
select BR2_PACKAGE_LIBPCRE
config BR2_PACKAGE_PHP4_MOD_PGSQL
prompt "...-mod-pgsql - PostgreSQL module"
tristate
# default m if CONFIG_DEVEL
default m if CONFIG_DEVEL
depends BR2_COMPILE_PHP4
select BR2_PACKAGE_LIBPQ
config BR2_PACKAGE_PHP4_MOD_SESSION
prompt "...-mod-session - Sessions module"
tristate
# default m if CONFIG_DEVEL
default m if CONFIG_DEVEL
depends BR2_COMPILE_PHP4
config BR2_PACKAGE_PHP4_MOD_SQLITE
prompt "...-mod-sqlite - SQLite module"
tristate
# default m if CONFIG_DEVEL
default m if CONFIG_DEVEL
depends BR2_COMPILE_PHP4
select BR2_PACKAGE_LIBSQLITE2
config BR2_PACKAGE_PHP4_MOD_SOCKETS
prompt "...-mod-sockets - Sockets module"
tristate
# default m if CONFIG_DEVEL
default m if CONFIG_DEVEL
depends BR2_COMPILE_PHP4
config BR2_PACKAGE_PHP4_MOD_XML
prompt "...-mod-xml - XML module"
tristate
# default m if CONFIG_DEVEL
default m if CONFIG_DEVEL
depends BR2_COMPILE_PHP4
select BR2_PACKAGE_LIBEXPAT

View File

@ -55,13 +55,29 @@ PKG_CONFIGURE_OPTS:= \
--with-zlib="$(STAGING_DIR)/usr" \
--with-zlib-dir="$(STAGING_DIR)/usr" \
ifneq ($(BR2_PACKAGE_PHP4_MOD_CURL),)
PKG_CONFIGURE_OPTS+= --with-curl=shared,"$(STAGING_DIR)/usr"
else
PKG_CONFIGURE_OPTS+= --without-curl
endif
ifneq ($(BR2_PACKAGE_PHP4_MOD_GD),)
PKG_CONFIGURE_OPTS+= --with-gd=shared,"$(STAGING_DIR)/usr" \
--without-freetype-dir \
--without-jpeg-dir \
--with-png-dir="$(STAGING_DIR)/usr" \
--without-xpm-dir \
--without-ttf \
--without-t1lib \
--enable-gd-native-ttf \
--with-png-dir="$(STAGING_DIR)/usr"
--disable-gd-jis-conv
else
PKG_CONFIGURE_OPTS+= --without-gd
endif
ifneq ($(BR2_PACKAGE_PHP4_MOD_GMP),)
PKG_CONFIGURE_OPTS+= --with-gmp=shared,"$(STAGING_DIR)/usr"
else
PKG_CONFIGURE_OPTS+= --without-gmp
endif
ifneq ($(BR2_PACKAGE_PHP4_MOD_LDAP),)
PKG_CONFIGURE_OPTS+= --with-ldap=shared,"$(STAGING_DIR)/usr"
--with-ldap-sasl="$(STAGING_DIR)/usr"
@ -99,8 +115,10 @@ $(eval $(call PKG_template,PHP4_CLI,php4-cli,$(PKG_VERSION)-$(PKG_RELEASE),$(ARC
$(eval $(call PKG_template,PHP4_CGI,php4-cgi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,PHP4_FASTCGI,php4-fastcgi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,PHP4_MOD_CURL,php4-mod-curl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,PHP4_MOD_FTP,php4-mod-ftp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,PHP4_MOD_GD,php4-mod-gd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,PHP4_MOD_GMP,php4-mod-gmp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,PHP4_MOD_LDAP,php4-mod-ldap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,PHP4_MOD_MYSQL,php4-mod-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,PHP4_MOD_OPENSSL,php4-mod-openssl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
@ -111,8 +129,10 @@ $(eval $(call PKG_template,PHP4_MOD_SOCKETS,php4-mod-sockets,$(PKG_VERSION)-$(PK
$(eval $(call PKG_template,PHP4_MOD_SQLITE,php4-mod-sqlite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,PHP4_MOD_XML,php4-mod-xml,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_mod_template,PHP4_MOD_CURL,curl))
$(eval $(call PKG_mod_template,PHP4_MOD_FTP,ftp))
$(eval $(call PKG_mod_template,PHP4_MOD_GD,gd))
$(eval $(call PKG_mod_template,PHP4_MOD_GMP,gmp))
$(eval $(call PKG_mod_template,PHP4_MOD_LDAP,ldap))
$(eval $(call PKG_mod_template,PHP4_MOD_MYSQL,mysql))
$(eval $(call PKG_mod_template,PHP4_MOD_OPENSSL,openssl))

View File

@ -0,0 +1,9 @@
Package: php4-mod-curl
Priority: optional
Section: net
Version: [TBDL]
Architecture: [TBDL]
Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>, Anael Orlinski <anael.orlinski@gmail.com>
Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/php4/
Depends: php4, libcurl
Description: cURL module for PHP4

View File

@ -0,0 +1,9 @@
Package: php4-mod-gmp
Priority: optional
Section: net
Version: [TBDL]
Architecture: [TBDL]
Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>, Anael Orlinski <anael.orlinski@gmail.com>
Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/php4/
Depends: php4, libgmp
Description: GMP (GNU MP) module for PHP4