From: mhei <mhei@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 21 Oct 2011 20:56:04 +0000 (+0000)
Subject: [packages] php5: Rework/fix config var handlin when built in SDK
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=34410a6deccbde3b7d7aa7524335dc6c65a7c1a9;p=packages.git

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



git-svn-id: svn://svn.openwrt.org/openwrt/packages@28508 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 2e9753413..b8f1d9f81 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
 PKG_VERSION:=5.3.8
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.php.net/distributions/
@@ -141,90 +141,73 @@ CONFIGURE_ARGS+= \
 	--with-pcre-regex="$(STAGING_DIR)/usr" \
 	--disable-phar
 
-ifneq ($(SDK),)
-  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),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-cli),)
   CONFIGURE_ARGS+= --enable-cli
 else
   CONFIGURE_ARGS+= --disable-cli
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-cgi),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-cgi),)
   CONFIGURE_ARGS+= --enable-cgi
 else
   CONFIGURE_ARGS+= --disable-cgi
 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
 else
   CONFIGURE_ARGS+= --disable-apc
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-ctype),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ctype),)
   CONFIGURE_ARGS+= --enable-ctype=shared
 else
   CONFIGURE_ARGS+= --disable-ctype
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-curl),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-curl),)
   CONFIGURE_ARGS+= --with-curl=shared,"$(STAGING_DIR)/usr"
 else
   CONFIGURE_ARGS+= --without-curl
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-fileinfo),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-fileinfo),)
   CONFIGURE_ARGS+= --enable-fileinfo=shared
 else
   CONFIGURE_ARGS+= --disable-fileinfo
 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"
 else
   CONFIGURE_ARGS+= --without-gettext
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-dio),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-dio),)
   CONFIGURE_ARGS+= --enable-dio=shared
 else
   CONFIGURE_ARGS+= --disable-dio
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-dom),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-dom),)
   CONFIGURE_ARGS+= --enable-dom=shared
 else
   CONFIGURE_ARGS+= --disable-dom
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-exif),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-exif),)
   CONFIGURE_ARGS+= --enable-exif=shared
 else
   CONFIGURE_ARGS+= --disable-exif
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-ftp),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ftp),)
   CONFIGURE_ARGS+= --enable-ftp=shared
 else
   CONFIGURE_ARGS+= --disable-ftp
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-gd),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gd),)
   CONFIGURE_ARGS+= \
 	--with-gd=shared,"$(STAGING_DIR)/usr" \
 	--without-freetype-dir \
@@ -238,19 +221,19 @@ else
   CONFIGURE_ARGS+= --without-gd
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-gmp),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gmp),)
   CONFIGURE_ARGS+= --with-gmp=shared,"$(STAGING_DIR)/usr"
 else
   CONFIGURE_ARGS+= --without-gmp
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-hash),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-hash),)
   CONFIGURE_ARGS+= --enable-hash=shared
 else
   CONFIGURE_ARGS+= --disable-hash
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-http),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-http),)
   CONFIGURE_ARGS+= \
 	--enable-http=shared \
 	--without-http-shared-deps \
@@ -259,7 +242,7 @@ else
   CONFIGURE_ARGS+= --disable-http
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-iconv),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-iconv),)
   CONFIGURE_ARGS+= --with-iconv=shared,"$(ICONV_PREFIX)"
 else
   CONFIGURE_ARGS+= --without-iconv
@@ -271,7 +254,7 @@ else
   CONFIGURE_ARGS+= --disable-json
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-ldap),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ldap),)
   CONFIGURE_ARGS+= \
 	--with-ldap=shared,"$(STAGING_DIR)/usr" \
 	--with-ldap-sasl="$(STAGING_DIR)/usr"
@@ -279,31 +262,31 @@ else
   CONFIGURE_ARGS+= --without-ldap
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-libevent),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-libevent),)
   CONFIGURE_ARGS+= --with-libevent=shared,"$(STAGING_DIR)/usr"
 else
   CONFIGURE_ARGS+= --without-libevent
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-mbstring),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mbstring),)
   CONFIGURE_ARGS+= --enable-mbstring=shared --enable-mbregex
 else
   CONFIGURE_ARGS+= --disable-mbstring
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-mcrypt),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mcrypt),)
   CONFIGURE_ARGS+=  --with-mcrypt=shared,"$(STAGING_DIR)/usr"
 else
   CONFIGURE_ARGS+= --without-mcrypt
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-mysql),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mysql),)
   CONFIGURE_ARGS+= --with-mysql=shared,"$(STAGING_DIR)/usr"
 else
   CONFIGURE_ARGS+= --without-mysql
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-openssl),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-openssl),)
   CONFIGURE_ARGS+= \
 	--with-openssl=shared,"$(STAGING_DIR)/usr" \
 	--with-kerberos=no \
@@ -312,25 +295,25 @@ else
   CONFIGURE_ARGS+= --without-openssl
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-pcntl),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pcntl),)
   CONFIGURE_ARGS+= --enable-pcntl=shared
 else
   CONFIGURE_ARGS+= --disable-pcntl
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-pdo),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo),)
   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"
   else
     CONFIGURE_ARGS+= --without-pdo-mysql
   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"
   else
     CONFIGURE_ARGS+= --without-pdo-pgsql
   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"
   else
     CONFIGURE_ARGS+= --without-pdo-sqlite
@@ -339,73 +322,73 @@ else
   CONFIGURE_ARGS+= --disable-pdo
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-pgsql),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pgsql),)
   CONFIGURE_ARGS+= --with-pgsql=shared,"$(STAGING_DIR)/usr"
 else
   CONFIGURE_ARGS+= --without-pgsql
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-session),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-session),)
   CONFIGURE_ARGS+= --enable-session=shared
 else
   CONFIGURE_ARGS+= --disable-session
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-simplexml),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-simplexml),)
   CONFIGURE_ARGS+= --enable-simplexml=shared
 else
   CONFIGURE_ARGS+= --disable-simplexml
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-soap),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-soap),)
   CONFIGURE_ARGS+= --enable-soap=shared
 else
   CONFIGURE_ARGS+= --disable-soap
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-sockets),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sockets),)
   CONFIGURE_ARGS+= --enable-sockets=shared
 else
   CONFIGURE_ARGS+= --disable-sockets
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-sqlite),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sqlite),)
   CONFIGURE_ARGS+= --with-sqlite=shared,"$(STAGING_DIR)/usr"
 else
   CONFIGURE_ARGS+= --without-sqlite
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-sqlite3),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sqlite3),)
   CONFIGURE_ARGS+= --with-sqlite3=shared,"$(STAGING_DIR)/usr"
 else
   CONFIGURE_ARGS+= --without-sqlite3
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-sysvmsg),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvmsg),)
   CONFIGURE_ARGS+= --enable-sysvmsg=shared
 else
   CONFIGURE_ARGS+= --disable-sysvmsg
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-sysvsem),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvsem),)
   CONFIGURE_ARGS+= --enable-sysvsem=shared
 else
   CONFIGURE_ARGS+= --disable-sysvsem
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-sysvshm),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvshm),)
   CONFIGURE_ARGS+= --enable-sysvshm=shared
 else
   CONFIGURE_ARGS+= --disable-sysvshm
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-tokenizer),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-tokenizer),)
   CONFIGURE_ARGS+= --enable-tokenizer=shared
 else
   CONFIGURE_ARGS+= --disable-tokenizer
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-xml),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xml),)
   CONFIGURE_ARGS+= --enable-xml=shared,"$(STAGING_DIR)/usr"
   ifneq ($(CONFIG_PHP5_LIBXML),)
     CONFIGURE_ARGS+= --with-libxml-dir="$(STAGING_DIR)/usr/include/libxml2"
@@ -416,25 +399,25 @@ else
   CONFIGURE_ARGS+= --disable-xml
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-xmlreader),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xmlreader),)
   CONFIGURE_ARGS+= --enable-xmlreader=shared,"$(STAGING_DIR)/usr"
 else
   CONFIGURE_ARGS+= --disable-xmlreader
 endif
 
-ifneq ($(CONFIG_PACKAGE_php5-mod-xmlwriter),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xmlwriter),)
   CONFIGURE_ARGS+= --enable-xmlwriter=shared,"$(STAGING_DIR)/usr"
 else
   CONFIGURE_ARGS+= --disable-xmlwriter
 endif
 
-ifneq ($(CONFIG_PHP5_FILTER),)
+ifneq ($(SDK)$(CONFIG_PHP5_FILTER),)
   CONFIGURE_ARGS+= --enable-filter
 else
   CONFIGURE_ARGS+= --disable-filter
 endif
 
-ifneq ($(CONFIG_PHP5_LIBXML),)
+ifneq ($(SDK)$(CONFIG_PHP5_LIBXML),)
   CONFIGURE_ARGS+= --enable-libxml
   CONFIGURE_ARGS+= --with-libxml-dir="$(STAGING_DIR)/usr/include/libxml2"
 else