upgrade php4 to 4.4.7 - fixes compile errors with updated curl versions, php4-sqlite needs to be added externally
git-svn-id: svn://svn.openwrt.org/openwrt/packages@10040 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
bc9a5b23e9
commit
24981482f6
@ -9,12 +9,12 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=php4
|
PKG_NAME:=php4
|
||||||
PKG_VERSION:=4.3.11
|
PKG_VERSION:=4.4.7
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=php-$(PKG_VERSION).tar.bz2
|
PKG_SOURCE:=php-$(PKG_VERSION).tar.bz2
|
||||||
PKG_SOURCE_URL:=http://fr.php.net/distributions/
|
PKG_SOURCE_URL:=http://fr.php.net/distributions/
|
||||||
PKG_MD5SUM:=fbc67d240812136a9842bc1f2a217b7a
|
PKG_MD5SUM:=3f21b44d37a57ca3876d3aea713c700d
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/php-$(PKG_VERSION)
|
PKG_BUILD_DIR:=$(BUILD_DIR)/php-$(PKG_VERSION)
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
@ -142,12 +142,6 @@ define Package/php4-mod-sockets
|
|||||||
TITLE:=Sockets module
|
TITLE:=Sockets module
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/php4-mod-sqlite
|
|
||||||
$(call Package/php4/Default)
|
|
||||||
DEPENDS:=php4 +libsqlite2
|
|
||||||
TITLE:=SQLite module
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/php4-mod-xml
|
define Package/php4-mod-xml
|
||||||
$(call Package/php4/Default)
|
$(call Package/php4/Default)
|
||||||
DEPENDS:=php4 +libexpat
|
DEPENDS:=php4 +libexpat
|
||||||
@ -186,7 +180,7 @@ PKG_CONFIGURE_OPTS:= \
|
|||||||
--with-zlib-dir="$(STAGING_DIR)/usr" \
|
--with-zlib-dir="$(STAGING_DIR)/usr" \
|
||||||
|
|
||||||
ifneq ($(SDK),)
|
ifneq ($(SDK),)
|
||||||
PKG_BUILD_DEPENDS:=libopenssl zlib libcurl libgd libgmp libopenldap libmysqlclient libpq libsqlite2 libexpat
|
PKG_BUILD_DEPENDS:=libopenssl zlib libcurl libgd libgmp libopenldap libmysqlclient libpq libexpat
|
||||||
# force PKG_CONFIGURE_{LIBS,OPTS} below when built in the SDK
|
# force PKG_CONFIGURE_{LIBS,OPTS} below when built in the SDK
|
||||||
CONFIG_PACKAGE_php4-cli:=m
|
CONFIG_PACKAGE_php4-cli:=m
|
||||||
CONFIG_PACKAGE_php4-cgi:=m
|
CONFIG_PACKAGE_php4-cgi:=m
|
||||||
@ -198,7 +192,6 @@ ifneq ($(SDK),)
|
|||||||
CONFIG_PACKAGE_php4-mod-mysql:=m
|
CONFIG_PACKAGE_php4-mod-mysql:=m
|
||||||
CONFIG_PACKAGE_php4-mod-pcre:=m
|
CONFIG_PACKAGE_php4-mod-pcre:=m
|
||||||
CONFIG_PACKAGE_php4-mod-pgsql:=m
|
CONFIG_PACKAGE_php4-mod-pgsql:=m
|
||||||
CONFIG_PACKAGE_php4-mod-sqlite:=m
|
|
||||||
CONFIG_PACKAGE_php4-mod-xml:=m
|
CONFIG_PACKAGE_php4-mod-xml:=m
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -246,11 +239,6 @@ ifneq ($(CONFIG_PACKAGE_php4-mod-pgsql),)
|
|||||||
else
|
else
|
||||||
PKG_CONFIGURE_OPTS+= --without-pgsql
|
PKG_CONFIGURE_OPTS+= --without-pgsql
|
||||||
endif
|
endif
|
||||||
ifneq ($(CONFIG_PACKAGE_php4-mod-sqlite),)
|
|
||||||
PKG_CONFIGURE_OPTS+= --with-sqlite=shared,"$(STAGING_DIR)/usr"
|
|
||||||
else
|
|
||||||
PKG_CONFIGURE_OPTS+= --without-sqlite
|
|
||||||
endif
|
|
||||||
ifneq ($(CONFIG_PACKAGE_php4-mod-xml),)
|
ifneq ($(CONFIG_PACKAGE_php4-mod-xml),)
|
||||||
PKG_CONFIGURE_OPTS+= --enable-xml=shared \
|
PKG_CONFIGURE_OPTS+= --enable-xml=shared \
|
||||||
--with-expat-dir="$(STAGING_DIR)/usr"
|
--with-expat-dir="$(STAGING_DIR)/usr"
|
||||||
@ -376,6 +364,5 @@ $(eval $(call BuildPlugin,php4-mod-pcre,pcre))
|
|||||||
$(eval $(call BuildPlugin,php4-mod-pgsql,pgsql))
|
$(eval $(call BuildPlugin,php4-mod-pgsql,pgsql))
|
||||||
$(eval $(call BuildPlugin,php4-mod-session,session))
|
$(eval $(call BuildPlugin,php4-mod-session,session))
|
||||||
$(eval $(call BuildPlugin,php4-mod-sockets,sockets))
|
$(eval $(call BuildPlugin,php4-mod-sockets,sockets))
|
||||||
$(eval $(call BuildPlugin,php4-mod-sqlite,sqlite))
|
|
||||||
$(eval $(call BuildPlugin,php4-mod-xml,xml))
|
$(eval $(call BuildPlugin,php4-mod-xml,xml))
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user