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

[packages] php5: Rework/fix config var handlin when built in SDK

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@28508 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mhei 2011-10-21 20:56:04 +00:00
parent d4fbfd2e0c
commit 34410a6dec
1 changed files with 44 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
lang/php5/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=php PKG_NAME:=php
PKG_VERSION:=5.3.8 PKG_VERSION:=5.3.8
PKG_RELEASE:=2 PKG_RELEASE:=3
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/
@ -141,90 +141,73 @@ CONFIGURE_ARGS+= \
--with-pcre-regex="$(STAGING_DIR)/usr" \ --with-pcre-regex="$(STAGING_DIR)/usr" \
--disable-phar --disable-phar
ifneq ($(SDK),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-cli),)
PKG_BUILD_DEPENDS+=libopenssl zlib libcurl libgd libgmp libopenldap libmysqlclient libpq libsqlite2 libpthread libsqlite3 libpcre libxml2
# force PKG_CONFIGURE_{LIBS,OPTS} below when built in the SDK
CONFIG_PACKAGE_php5-cli:=m
CONFIG_PACKAGE_php5-cgi:=m
CONFIG_PACKAGE_php5-fastcgi:=m
CONFIG_PACKAGE_php5-mod-curl:=m
CONFIG_PACKAGE_php5-mod-gd:=m
CONFIG_PACKAGE_php5-mod-gmp:=m
CONFIG_PACKAGE_php5-mod-ldap:=m
CONFIG_PACKAGE_php5-mod-mysql:=m
CONFIG_PACKAGE_php5-mod-pgsql:=m
CONFIG_PACKAGE_php5-mod-sqlite:=m
CONFIG_PACKAGE_php5-mod-sqlite3:=m
CONFIG_PACKAGE_php5-mod-xml:=m
endif
ifneq ($(CONFIG_PACKAGE_php5-cli),)
CONFIGURE_ARGS+= --enable-cli CONFIGURE_ARGS+= --enable-cli
else else
CONFIGURE_ARGS+= --disable-cli CONFIGURE_ARGS+= --disable-cli
endif endif
ifneq ($(CONFIG_PACKAGE_php5-cgi),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-cgi),)
CONFIGURE_ARGS+= --enable-cgi CONFIGURE_ARGS+= --enable-cgi
else else
CONFIGURE_ARGS+= --disable-cgi CONFIGURE_ARGS+= --disable-cgi
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-apc),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-apc),)
CONFIGURE_ARGS+= --enable-apc=shared --disable-apc-mmap --disable-apc-pthreadmutex CONFIGURE_ARGS+= --enable-apc=shared --disable-apc-mmap --disable-apc-pthreadmutex
else else
CONFIGURE_ARGS+= --disable-apc CONFIGURE_ARGS+= --disable-apc
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-ctype),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ctype),)
CONFIGURE_ARGS+= --enable-ctype=shared CONFIGURE_ARGS+= --enable-ctype=shared
else else
CONFIGURE_ARGS+= --disable-ctype CONFIGURE_ARGS+= --disable-ctype
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-curl),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-curl),)
CONFIGURE_ARGS+= --with-curl=shared,"$(STAGING_DIR)/usr" CONFIGURE_ARGS+= --with-curl=shared,"$(STAGING_DIR)/usr"
else else
CONFIGURE_ARGS+= --without-curl CONFIGURE_ARGS+= --without-curl
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-fileinfo),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-fileinfo),)
CONFIGURE_ARGS+= --enable-fileinfo=shared CONFIGURE_ARGS+= --enable-fileinfo=shared
else else
CONFIGURE_ARGS+= --disable-fileinfo CONFIGURE_ARGS+= --disable-fileinfo
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-gettext),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gettext),)
CONFIGURE_ARGS+= --with-gettext=shared,"$(STAGING_DIR)/usr/lib/libintl-full" CONFIGURE_ARGS+= --with-gettext=shared,"$(STAGING_DIR)/usr/lib/libintl-full"
else else
CONFIGURE_ARGS+= --without-gettext CONFIGURE_ARGS+= --without-gettext
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-dio),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-dio),)
CONFIGURE_ARGS+= --enable-dio=shared CONFIGURE_ARGS+= --enable-dio=shared
else else
CONFIGURE_ARGS+= --disable-dio CONFIGURE_ARGS+= --disable-dio
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-dom),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-dom),)
CONFIGURE_ARGS+= --enable-dom=shared CONFIGURE_ARGS+= --enable-dom=shared
else else
CONFIGURE_ARGS+= --disable-dom CONFIGURE_ARGS+= --disable-dom
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-exif),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-exif),)
CONFIGURE_ARGS+= --enable-exif=shared CONFIGURE_ARGS+= --enable-exif=shared
else else
CONFIGURE_ARGS+= --disable-exif CONFIGURE_ARGS+= --disable-exif
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-ftp),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ftp),)
CONFIGURE_ARGS+= --enable-ftp=shared CONFIGURE_ARGS+= --enable-ftp=shared
else else
CONFIGURE_ARGS+= --disable-ftp CONFIGURE_ARGS+= --disable-ftp
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-gd),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gd),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-gd=shared,"$(STAGING_DIR)/usr" \ --with-gd=shared,"$(STAGING_DIR)/usr" \
--without-freetype-dir \ --without-freetype-dir \
@ -238,19 +221,19 @@ else
CONFIGURE_ARGS+= --without-gd CONFIGURE_ARGS+= --without-gd
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-gmp),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gmp),)
CONFIGURE_ARGS+= --with-gmp=shared,"$(STAGING_DIR)/usr" CONFIGURE_ARGS+= --with-gmp=shared,"$(STAGING_DIR)/usr"
else else
CONFIGURE_ARGS+= --without-gmp CONFIGURE_ARGS+= --without-gmp
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-hash),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-hash),)
CONFIGURE_ARGS+= --enable-hash=shared CONFIGURE_ARGS+= --enable-hash=shared
else else
CONFIGURE_ARGS+= --disable-hash CONFIGURE_ARGS+= --disable-hash
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-http),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-http),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--enable-http=shared \ --enable-http=shared \
--without-http-shared-deps \ --without-http-shared-deps \
@ -259,7 +242,7 @@ else
CONFIGURE_ARGS+= --disable-http CONFIGURE_ARGS+= --disable-http
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-iconv),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-iconv),)
CONFIGURE_ARGS+= --with-iconv=shared,"$(ICONV_PREFIX)" CONFIGURE_ARGS+= --with-iconv=shared,"$(ICONV_PREFIX)"
else else
CONFIGURE_ARGS+= --without-iconv CONFIGURE_ARGS+= --without-iconv
@ -271,7 +254,7 @@ else
CONFIGURE_ARGS+= --disable-json CONFIGURE_ARGS+= --disable-json
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-ldap),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ldap),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-ldap=shared,"$(STAGING_DIR)/usr" \ --with-ldap=shared,"$(STAGING_DIR)/usr" \
--with-ldap-sasl="$(STAGING_DIR)/usr" --with-ldap-sasl="$(STAGING_DIR)/usr"
@ -279,31 +262,31 @@ else
CONFIGURE_ARGS+= --without-ldap CONFIGURE_ARGS+= --without-ldap
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-libevent),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-libevent),)
CONFIGURE_ARGS+= --with-libevent=shared,"$(STAGING_DIR)/usr" CONFIGURE_ARGS+= --with-libevent=shared,"$(STAGING_DIR)/usr"
else else
CONFIGURE_ARGS+= --without-libevent CONFIGURE_ARGS+= --without-libevent
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-mbstring),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mbstring),)
CONFIGURE_ARGS+= --enable-mbstring=shared --enable-mbregex CONFIGURE_ARGS+= --enable-mbstring=shared --enable-mbregex
else else
CONFIGURE_ARGS+= --disable-mbstring CONFIGURE_ARGS+= --disable-mbstring
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-mcrypt),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mcrypt),)
CONFIGURE_ARGS+= --with-mcrypt=shared,"$(STAGING_DIR)/usr" CONFIGURE_ARGS+= --with-mcrypt=shared,"$(STAGING_DIR)/usr"
else else
CONFIGURE_ARGS+= --without-mcrypt CONFIGURE_ARGS+= --without-mcrypt
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-mysql),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mysql),)
CONFIGURE_ARGS+= --with-mysql=shared,"$(STAGING_DIR)/usr" CONFIGURE_ARGS+= --with-mysql=shared,"$(STAGING_DIR)/usr"
else else
CONFIGURE_ARGS+= --without-mysql CONFIGURE_ARGS+= --without-mysql
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-openssl),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-openssl),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-openssl=shared,"$(STAGING_DIR)/usr" \ --with-openssl=shared,"$(STAGING_DIR)/usr" \
--with-kerberos=no \ --with-kerberos=no \
@ -312,25 +295,25 @@ else
CONFIGURE_ARGS+= --without-openssl CONFIGURE_ARGS+= --without-openssl
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-pcntl),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pcntl),)
CONFIGURE_ARGS+= --enable-pcntl=shared CONFIGURE_ARGS+= --enable-pcntl=shared
else else
CONFIGURE_ARGS+= --disable-pcntl CONFIGURE_ARGS+= --disable-pcntl
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-pdo),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo),)
CONFIGURE_ARGS+= --enable-pdo=shared CONFIGURE_ARGS+= --enable-pdo=shared
ifneq ($(CONFIG_PACKAGE_php5-mod-pdo-mysql),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo-mysql),)
CONFIGURE_ARGS+= --with-pdo-mysql=shared,"$(STAGING_DIR)/usr" CONFIGURE_ARGS+= --with-pdo-mysql=shared,"$(STAGING_DIR)/usr"
else else
CONFIGURE_ARGS+= --without-pdo-mysql CONFIGURE_ARGS+= --without-pdo-mysql
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-pdo-pgsql),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo-pgsql),)
CONFIGURE_ARGS+= --with-pdo-pgsql=shared,"$(STAGING_DIR)/usr" CONFIGURE_ARGS+= --with-pdo-pgsql=shared,"$(STAGING_DIR)/usr"
else else
CONFIGURE_ARGS+= --without-pdo-pgsql CONFIGURE_ARGS+= --without-pdo-pgsql
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-pdo-sqlite),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo-sqlite),)
CONFIGURE_ARGS+= --with-pdo-sqlite=shared,"$(STAGING_DIR)/usr" CONFIGURE_ARGS+= --with-pdo-sqlite=shared,"$(STAGING_DIR)/usr"
else else
CONFIGURE_ARGS+= --without-pdo-sqlite CONFIGURE_ARGS+= --without-pdo-sqlite
@ -339,73 +322,73 @@ else
CONFIGURE_ARGS+= --disable-pdo CONFIGURE_ARGS+= --disable-pdo
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-pgsql),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pgsql),)
CONFIGURE_ARGS+= --with-pgsql=shared,"$(STAGING_DIR)/usr" CONFIGURE_ARGS+= --with-pgsql=shared,"$(STAGING_DIR)/usr"
else else
CONFIGURE_ARGS+= --without-pgsql CONFIGURE_ARGS+= --without-pgsql
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-session),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-session),)
CONFIGURE_ARGS+= --enable-session=shared CONFIGURE_ARGS+= --enable-session=shared
else else
CONFIGURE_ARGS+= --disable-session CONFIGURE_ARGS+= --disable-session
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-simplexml),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-simplexml),)
CONFIGURE_ARGS+= --enable-simplexml=shared CONFIGURE_ARGS+= --enable-simplexml=shared
else else
CONFIGURE_ARGS+= --disable-simplexml CONFIGURE_ARGS+= --disable-simplexml
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-soap),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-soap),)
CONFIGURE_ARGS+= --enable-soap=shared CONFIGURE_ARGS+= --enable-soap=shared
else else
CONFIGURE_ARGS+= --disable-soap CONFIGURE_ARGS+= --disable-soap
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-sockets),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sockets),)
CONFIGURE_ARGS+= --enable-sockets=shared CONFIGURE_ARGS+= --enable-sockets=shared
else else
CONFIGURE_ARGS+= --disable-sockets CONFIGURE_ARGS+= --disable-sockets
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-sqlite),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sqlite),)
CONFIGURE_ARGS+= --with-sqlite=shared,"$(STAGING_DIR)/usr" CONFIGURE_ARGS+= --with-sqlite=shared,"$(STAGING_DIR)/usr"
else else
CONFIGURE_ARGS+= --without-sqlite CONFIGURE_ARGS+= --without-sqlite
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-sqlite3),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sqlite3),)
CONFIGURE_ARGS+= --with-sqlite3=shared,"$(STAGING_DIR)/usr" CONFIGURE_ARGS+= --with-sqlite3=shared,"$(STAGING_DIR)/usr"
else else
CONFIGURE_ARGS+= --without-sqlite3 CONFIGURE_ARGS+= --without-sqlite3
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-sysvmsg),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvmsg),)
CONFIGURE_ARGS+= --enable-sysvmsg=shared CONFIGURE_ARGS+= --enable-sysvmsg=shared
else else
CONFIGURE_ARGS+= --disable-sysvmsg CONFIGURE_ARGS+= --disable-sysvmsg
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-sysvsem),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvsem),)
CONFIGURE_ARGS+= --enable-sysvsem=shared CONFIGURE_ARGS+= --enable-sysvsem=shared
else else
CONFIGURE_ARGS+= --disable-sysvsem CONFIGURE_ARGS+= --disable-sysvsem
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-sysvshm),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvshm),)
CONFIGURE_ARGS+= --enable-sysvshm=shared CONFIGURE_ARGS+= --enable-sysvshm=shared
else else
CONFIGURE_ARGS+= --disable-sysvshm CONFIGURE_ARGS+= --disable-sysvshm
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-tokenizer),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-tokenizer),)
CONFIGURE_ARGS+= --enable-tokenizer=shared CONFIGURE_ARGS+= --enable-tokenizer=shared
else else
CONFIGURE_ARGS+= --disable-tokenizer CONFIGURE_ARGS+= --disable-tokenizer
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-xml),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xml),)
CONFIGURE_ARGS+= --enable-xml=shared,"$(STAGING_DIR)/usr" CONFIGURE_ARGS+= --enable-xml=shared,"$(STAGING_DIR)/usr"
ifneq ($(CONFIG_PHP5_LIBXML),) ifneq ($(CONFIG_PHP5_LIBXML),)
CONFIGURE_ARGS+= --with-libxml-dir="$(STAGING_DIR)/usr/include/libxml2" CONFIGURE_ARGS+= --with-libxml-dir="$(STAGING_DIR)/usr/include/libxml2"
@ -416,25 +399,25 @@ else
CONFIGURE_ARGS+= --disable-xml CONFIGURE_ARGS+= --disable-xml
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-xmlreader),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xmlreader),)
CONFIGURE_ARGS+= --enable-xmlreader=shared,"$(STAGING_DIR)/usr" CONFIGURE_ARGS+= --enable-xmlreader=shared,"$(STAGING_DIR)/usr"
else else
CONFIGURE_ARGS+= --disable-xmlreader CONFIGURE_ARGS+= --disable-xmlreader
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-xmlwriter),) ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xmlwriter),)
CONFIGURE_ARGS+= --enable-xmlwriter=shared,"$(STAGING_DIR)/usr" CONFIGURE_ARGS+= --enable-xmlwriter=shared,"$(STAGING_DIR)/usr"
else else
CONFIGURE_ARGS+= --disable-xmlwriter CONFIGURE_ARGS+= --disable-xmlwriter
endif endif
ifneq ($(CONFIG_PHP5_FILTER),) ifneq ($(SDK)$(CONFIG_PHP5_FILTER),)
CONFIGURE_ARGS+= --enable-filter CONFIGURE_ARGS+= --enable-filter
else else
CONFIGURE_ARGS+= --disable-filter CONFIGURE_ARGS+= --disable-filter
endif endif
ifneq ($(CONFIG_PHP5_LIBXML),) ifneq ($(SDK)$(CONFIG_PHP5_LIBXML),)
CONFIGURE_ARGS+= --enable-libxml CONFIGURE_ARGS+= --enable-libxml
CONFIGURE_ARGS+= --with-libxml-dir="$(STAGING_DIR)/usr/include/libxml2" CONFIGURE_ARGS+= --with-libxml-dir="$(STAGING_DIR)/usr/include/libxml2"
else else