bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] php5: compile cli/cgi sapi unconditionally

Browse Source 
Compiling php without a sapi does not make much sense and often
people forget to choose one of the both openwrt packages. But this
results in a compile error, so it's better to always compile both
sapis.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@38825 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mhei 2013-11-16 22:22:28 +00:00
parent 752da439a7
commit 69fcd7a319
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lang/php5/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=php PKG_NAME:=php
PKG_VERSION:=5.4.22 PKG_VERSION:=5.4.22
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.php.net/distributions/ PKG_SOURCE_URL:=http://www.php.net/distributions/
@ -37,7 +37,6 @@ PHP5_MODULES = \
xml xmlreader xmlwriter zip \ xml xmlreader xmlwriter zip \
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_php5-cgi CONFIG_PACKAGE_php5-cli \
$(patsubst %,CONFIG_PACKAGE_php5-mod-%,$(PHP5_MODULES)) \ $(patsubst %,CONFIG_PACKAGE_php5-mod-%,$(PHP5_MODULES)) \
CONFIG_PHP5_FILTER CONFIG_PHP5_LIBXML CONFIG_PHP5_SYSTEMTZDATA CONFIG_PHP5_FILTER CONFIG_PHP5_LIBXML CONFIG_PHP5_SYSTEMTZDATA
@ -124,6 +123,8 @@ define Package/php5-fastcgi/description
endef endef
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--enable-cli \
--enable-cgi \
--enable-shared \ --enable-shared \
--disable-static \ --disable-static \
--disable-rpath \ --disable-rpath \
@ -139,18 +140,6 @@ CONFIGURE_ARGS+= \
--with-pcre-regex="$(STAGING_DIR)/usr" \ --with-pcre-regex="$(STAGING_DIR)/usr" \
--disable-phar --disable-phar
ifneq ($(SDK)$(CONFIG_PACKAGE_php5-cli),)
CONFIGURE_ARGS+= --enable-cli
else
CONFIGURE_ARGS+= --disable-cli
endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php5-cgi),)
CONFIGURE_ARGS+= --enable-cgi
else
CONFIGURE_ARGS+= --disable-cgi
endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-calendar),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-calendar),)
CONFIGURE_ARGS+= --enable-calendar=shared CONFIGURE_ARGS+= --enable-calendar=shared
else else