X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=lang%2Fphp5%2FMakefile;h=51201df21ca3013ca9f2c8993fafa78c1bd6d101;hp=5da72cbb37fda400ef639b7758e789e6b6d01c3b;hb=2ff7764d1671daef40b227f2214994533c2839fb;hpb=b45a4053cb5220048bd87bbd1395e17640604f35 diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 5da72cbb37..51201df21c 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006,2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,67 +9,70 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=5.1.6 +PKG_VERSION:=5.2.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://fr.php.net/distributions/ -PKG_MD5SUM:=08e423aa314369d4392a36b3f7246afc -PKG_CAT:=bzcat - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=http://www.php.net/distributions/ +PKG_MD5SUM:=1fe14ca892460b09f06729941a1bb605 include $(INCLUDE_DIR)/package.mk define Package/php5/Default + SUBMENU:=PHP SECTION:=lang CATEGORY:=Languages TITLE:=PHP5 Hypertext preprocessor - DESCRIPTION:=\ - PHP is a widely-used general-purpose scripting language that is especially \\\ - suited for Web development and can be embedded into HTML. URL:=http://www.php.net/ endef +define Package/php5/Default/description + PHP is a widely-used general-purpose scripting language that is especially + suited for Web development and can be embedded into HTML. +endef + define Package/php5 $(call Package/php5/Default) DEPENDS:=+libopenssl +zlib - DESCRIPTION+=\\\ - \\\ - This package contains only the PHP config file. You must actually choose your \\\ - PHP flavour (cli, cgi or fastcgi). - MENU:=1 endef -define Package/php5/conffiles -/etc/php.ini +define Package/php5/description +$(call Package/php5/Default/description) + This package contains only the PHP config file. You must actually choose + your PHP flavour (cli, cgi or fastcgi). endef define Package/php5-cli $(call Package/php5/Default) DEPENDS:=php5 TITLE+= (CLI) - DESCRIPTION+=\\\ - \\\ - This package contains the CLI version of the PHP5 interpreter. +endef + +define Package/php5-cli/description +$(call Package/php5/Default/description) + This package contains the CLI version of the PHP5 interpreter. endef define Package/php5-cgi $(call Package/php5/Default) DEPENDS:=php5 TITLE+= (CGI) - DESCRIPTION+=\\\ - \\\ - This package contains the CGI version of the PHP5 interpreter. +endef + +define Package/php5-cgi/description +$(call Package/php5/Default/description) + This package contains the CGI version of the PHP5 interpreter. endef define Package/php5-fastcgi $(call Package/php5/Default) DEPENDS:=php5 TITLE+= (FastCGI) - DESCRIPTION+=\\\ - \\\ - This package contains the FastCGI version of the PHP5 interpreter. +endef + +define Package/php5-fastcgi/description +$(call Package/php5/Default/description) + This package contains the FastCGI version of the PHP5 interpreter. endef define Package/php5-mod-curl @@ -98,7 +101,7 @@ endef define Package/php5-mod-ldap $(call Package/php5/Default) - DEPENDS:=php5 +libopenldap + DEPENDS:=php5 +libopenldap +libsasl2 TITLE:=LDAP module endef @@ -150,6 +153,12 @@ define Package/php5-mod-xml TITLE:=XML module endef +define Package/php5-mod-apc + $(call Package/php5/Default) + DEPENDS:=php5 + TITLE:=APC Extension +endef + PKG_CONFIGURE_LIBS:= -lcrypto -lssl PKG_CONFIGURE_OPTS:= \ --enable-shared \ @@ -186,6 +195,7 @@ PKG_CONFIGURE_OPTS:= \ --disable-tokenizer \ --with-zlib="$(STAGING_DIR)/usr" \ --with-zlib-dir="$(STAGING_DIR)/usr" \ + --disable-filter ifneq ($(SDK),) PKG_BUILD_DEPENDS:=libopenssl zlib libcurl libgd libgmp libopenldap libmysqlclient libpq libsqlite2 libexpat @@ -216,7 +226,7 @@ ifneq ($(CONFIG_PACKAGE_php5-mod-gd),) --with-png-dir="$(STAGING_DIR)/usr" \ --without-xpm-dir \ --without-ttf \ - --without-t1lib \ + --without-t1lib \ --enable-gd-native-ttf \ --disable-gd-jis-conv else @@ -259,6 +269,12 @@ ifneq ($(CONFIG_PACKAGE_php5-mod-xml),) else PKG_CONFIGURE_OPTS+= --disable-xml endif +ifneq ($(CONFIG_PACKAGE_php5-mod-apc),) + PKG_CONFIGURE_OPTS+= --enable-apc --disable-apc-mmap + PKG_CONFIGURE_LIBS+= -lrt +else + PKG_CONFIGURE_OPTS+= --disable-apc +endif define Build/Configure endef @@ -297,13 +313,15 @@ ifneq ($(CONFIG_PACKAGE_php5-cgi),) php_cv_cc_rpath="no" \ ) $(MAKE) -C $(PKG_BUILD_DIR) - mv $(PKG_BUILD_DIR)/sapi/cgi/php $(PKG_BUILD_DIR)/php-cgi + mv $(PKG_BUILD_DIR)/sapi/cgi/php-cgi $(PKG_BUILD_DIR)/php-cgi endef endif ifneq ($(CONFIG_PACKAGE_php5-fastcgi),) define Build/Compile/php5-fastcgi -$(MAKE) -C $(PKG_BUILD_DIR) clean + rm $(PKG_BUILD_DIR)/configure + cd $(PKG_BUILD_DIR) && ./buildconf --force $(call Build/Configure/Default, \ $(PKG_CONFIGURE_OPTS) \ --disable-cli \ @@ -316,7 +334,7 @@ ifneq ($(CONFIG_PACKAGE_php5-fastcgi),) php_cv_cc_rpath="no" \ ) $(MAKE) -C $(PKG_BUILD_DIR) - mv $(PKG_BUILD_DIR)/sapi/cgi/php $(PKG_BUILD_DIR)/php-fastcgi + mv $(PKG_BUILD_DIR)/sapi/cgi/php-cgi $(PKG_BUILD_DIR)/php-fcgi endef endif @@ -326,6 +344,10 @@ define Build/Compile $(call Build/Compile/php5-fastcgi) endef +define Package/php5/conffiles +/etc/php.ini +endef + define Package/php5/install $(INSTALL_DIR) $(1)/etc $(INSTALL_DATA) ./files/php.ini $(1)/etc/ @@ -333,17 +355,17 @@ endef define Package/php5-cli/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_BUILD_DIR)/php-cli $(1)/usr/bin/php + $(CP) $(PKG_BUILD_DIR)/php-cli $(1)/usr/bin/php-cli endef define Package/php5-cgi/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_BUILD_DIR)/php-cgi $(1)/usr/bin/php + $(CP) $(PKG_BUILD_DIR)/php-cgi $(1)/usr/bin/php-cgi endef define Package/php5-fastcgi/install - $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/php-fastcgi $(1)/usr/sbin/php + $(INSTALL_DIR) $(1)/usr/bin + $(CP) $(PKG_BUILD_DIR)/php-fcgi $(1)/usr/bin/php-fcgi $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/php.init $(1)/etc/init.d/php endef @@ -376,3 +398,4 @@ $(eval $(call BuildPlugin,php5-mod-session,session)) $(eval $(call BuildPlugin,php5-mod-sockets,sockets)) $(eval $(call BuildPlugin,php5-mod-sqlite,sqlite)) $(eval $(call BuildPlugin,php5-mod-xml,xml)) +$(eval $(call BuildPlugin,php5-mod-apc))