From 4955099de0e7210a2cbdbfc5b27c59ad152f4266 Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Sun, 19 Aug 2007 21:02:46 +0000
Subject: [PATCH] =?UTF-8?q?Fr=C3=A5n:=20=09Brad=20House=20<brad@mainstreet?=
 =?UTF-8?q?softworks.com>=20Till:=20=09buildroot@uclibc.org=20=C3=84mne:?=
 =?UTF-8?q?=20=09[Buildroot]=20[patch]=20php=20fixes=20and=20updates=20Dat?=
 =?UTF-8?q?um:=20=09Tue,=2014=20Aug=202007=2016:39:03=20-0400=20=20(22.39?=
 =?UTF-8?q?=20CEST)=20Changes:=20=20=20=20=20=20=20=20=20-=20fastcgi=20con?=
 =?UTF-8?q?fig=20option=20=20=20=20=20=20=20=20=20-=20force=20php=20to=20f?=
 =?UTF-8?q?ind=20the=20php.ini=20in=20/etc=20(it=20seems=20to=20default=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20to=20/lib=20for=20some=20reason)?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20-=20build=20with=20posix=20support,?=
 =?UTF-8?q?=20a=20lot=20of=20php=20scripts=20require=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20this=20apparently=20=20=20=20=20=20=20=20=20-=20str?=
 =?UTF-8?q?ip=20the=20php=20binary=20when=20installing=20to=20TARGET=5FDIR?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20-=20actually=20'uninstall'=20php=20o?=
 =?UTF-8?q?n=20a=20php-clean?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-Brad
---
 package/php/Config.in |  7 +++++++
 package/php/php.mk    | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/package/php/Config.in b/package/php/Config.in
index e8e861db49..e5d4ff3b88 100644
--- a/package/php/Config.in
+++ b/package/php/Config.in
@@ -24,6 +24,13 @@ config BR2_PACKAGE_PHP_CGI
           cgi interface for php
           you must have at least cli or cgi selected.
 
+config BR2_PACKAGE_PHP_FASTCGI
+        bool "fastcgi"
+        depends on BR2_PACKAGE_PHP_CGI
+        default y
+        help
+          fast cgi interface for php
+
 config BR2_PACKAGE_PHP_OPENSSL
         bool "openssl support"
         depends on BR2_PACKAGE_PHP && BR2_PACKAGE_OPENSSL
diff --git a/package/php/php.mk b/package/php/php.mk
index cf4422f6f2..f9550d9323 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -19,10 +19,13 @@ else
 endif
 
 ifneq ($(BR2_PACKAGE_PHP_CGI),y)
-	PHP_CGI="--disable-cgi"
+	PHP_CGI=--disable-cgi
 else
-	PHP_CGI="--enable-cgi"
+	PHP_CGI=--enable-cgi
 	PHP_TARGET_DEPS+=$(TARGET_DIR)/usr/bin/php-cgi
+	ifeq ($(BR2_PACKAGE_PHP_FASTCGI),y)
+		PHP_CGI+=--enable-fastcgi
+	endif
 endif
 
 ifeq ($(BR2_PACKAGE_PHP_OPENSSL),y)
@@ -69,6 +72,7 @@ $(PHP_DIR)/.configured: $(PHP_DIR)/.unpacked
 		--sbindir=/usr/sbin \
 		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
+		--with-config-file-path=/etc \
 		--datadir=/usr/share/misc \
 		--localstatedir=/var \
 		--mandir=/usr/man \
@@ -77,6 +81,7 @@ $(PHP_DIR)/.configured: $(PHP_DIR)/.unpacked
 		--enable-spl \
 		--enable-session \
 		--enable-sockets \
+		--enable-posix \
 		--with-pcre-regex \
 		--without-pear \
 		--disable-ipv6 \
@@ -100,10 +105,12 @@ $(PHP_DIR)/.staged: $(PHP_DIR)/.built
 $(TARGET_DIR)/usr/bin/php: $(PHP_DIR)/.staged
 	cp -dpf $(STAGING_DIR)/usr/bin/php $(TARGET_DIR)/usr/bin/php
 	chmod 755 $(TARGET_DIR)/usr/bin/php
+	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/php
 
 $(TARGET_DIR)/usr/bin/php-cgi: $(PHP_DIR)/.staged
 	cp -dpf $(STAGING_DIR)/usr/bin/php-cgi $(TARGET_DIR)/usr/bin/php-cgi
 	chmod 755 $(TARGET_DIR)/usr/bin/php-cgi
+	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/php-cgi
 
 $(TARGET_DIR)/etc/php.ini: $(PHP_DIR)/.staged
 	cp $(PHP_DIR)/php.ini-dist $(TARGET_DIR)/etc/php.ini
@@ -112,6 +119,9 @@ php: uclibc $(PHP_DEPS) $(PHP_TARGET_DEPS) $(TARGET_DIR)/etc/php.ini
 
 php-clean:
 	rm -f $(PHP_DIR)/.configured $(PHP_DIR)/.built $(PHP_DIR)/.staged
+	rm -f $(TARGET_DIR)/usr/bin/php $(TARGET_DIR)/usr/bin/php-cgi
+	rm -f $(STAGING_DIR)/usr/bin/php* $(STAGING_DIR)/usr/man/man1/php*
+	rm -rf $(STAGING_DIR)/usr/include/php
 	-$(MAKE) -C $(PHP_DIR) clean
 
 php-dirclean: