X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fphp;h=a679a071d5638e207e071663f264fd71268d706f;hp=10218029d8130fc1d685b4de820500ff437708d5;hb=bfdd4688c944201ea35aede4148c70691d424ce6;hpb=f5679937b82bfce56f7d9599a072e838133e21fa

diff --git a/lfs/php b/lfs/php
index 10218029d8..a679a071d5 100644
--- a/lfs/php
+++ b/lfs/php
@@ -31,16 +31,25 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = php
+PAK_VER    = 1
+
+DEPS       = ""
+
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) idn-0.1.tgz Log-1.9.11.tgz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
+Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
 
 $(DL_FILE)_MD5 = 55c97a671fdabf462cc7a82971a656d2
+idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
+Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
 
 install : $(TARGET)
 
@@ -72,7 +81,8 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml && \
+		cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && sed -i 's/const char \*errpfx,/const DB_ENV *dbenv, & const/' ext/dba/dba_db4.c
 	cd $(DIR_APP) && ./configure --prefix=/usr \
 										            --sysconfdir=/etc \
@@ -83,7 +93,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 										            --with-config-file-path=/etc \
 										            --with-openssl \
 										            --with-kerberos \
-										            --with-pcre-regex=/usr \
 										            --with-zlib \
 										            --enable-bcmath \
 										            --with-bz2 \
@@ -117,8 +126,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 										            --with-iconv
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	cd $(DIR_APP) && install -v -m644 php.ini-recommended /etc/php.ini
-	grep -v libphp5.so < /etc/httpd/conf/httpd.conf > /etc/httpd/conf/httpd.conf.bak
+	cd $(DIR_APP) && install -v -m644 $(DIR_SRC)/config/php/php.ini /etc/php.ini
+	-grep -v libphp5.so < /etc/httpd/conf/httpd.conf > /etc/httpd/conf/httpd.conf.bak
 	mv -f /etc/httpd/conf/httpd.conf.bak /etc/httpd/conf/httpd.conf
-	@rm -rf $(DIR_APP)
+	cd $(DIR_SRC) && tar xfz $(DIR_DL)/idn-0.1.tgz
+	-rm -f $(DIR_SRC)/package.xml
+	cd $(DIR_SRC)/idn-* && phpize
+	cd $(DIR_SRC)/idn-* && ./configure --prefix=/usr --with-idn
+	cd $(DIR_SRC)/idn-* && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_SRC)/idn-* && make install
+	cd $(DIR_SRC) && tar xfz $(DIR_DL)/Log-1.9.11.tgz
+	-rm -f $(DIR_SRC)/package.xml
+	cd $(DIR_SRC)/Log-* && cp -av Log Log.php /usr/lib/php 
+	@rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml
 	@$(POSTBUILD)