X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fphp;h=8139e2128400e4c6ad77061aad91fbb9e8ac3b27;hb=afd6e1931defb60665b40438d8e54db6de46246f;hp=d5cd224d28fe8ddf641518ff722bdbb28796774e;hpb=da5529e1866699d015ecc3686db61bf54c734ea6;p=ipfire-2.x.git

diff --git a/lfs/php b/lfs/php
index d5cd224d28..8139e21284 100644
--- a/lfs/php
+++ b/lfs/php
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,18 +24,17 @@
 
 include Config
 
-VER        = 5.2.4
+VER        = 5.3.27
 
 THISAPP    = php-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = php
-PAK_VER    = 1
-
-DEPS       = ""
 
+ifeq "$(MACHINE_TYPE)" "arm"
+	CFLAGS    := $(patsubst -march=%,,$(CFLAGS))
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -47,7 +46,7 @@ $(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
+$(DL_FILE)_MD5 = 25ae23a5b9615fe8d33de5b63e1bb788
 idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
 
@@ -59,9 +58,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
-	@$(PAK)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -83,7 +79,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@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 \
 										            --with-apxs2 \
@@ -119,11 +114,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 										            --with-mysql-sock=/var/run/mysql \
 										            --with-ncurses \
 										            --with-pdo-mysql \
-										            --without-pdo-sqlite \
+										            --with-pdo-sqlite \
 										            --with-readline \
 										            --enable-sockets \
 										            --with-xsl \
-										            --with-iconv
+										            --with-iconv \
+										            --enable-zip
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && install -v -m644 $(DIR_SRC)/config/php/php.ini /etc/php.ini
@@ -133,7 +129,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	-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
+	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