Merge branch 'master' into next

[ipfire-2.x.git] / lfs / php

diff --git a/lfs/php b/lfs/php
index 075d4fbae4dcd18158253c5f327efcfa74be2bb1..8717ccac14c5c1dcbe1946bf600f92432e0187e1 100644 (file)
--- a/lfs/php
+++ b/lfs/php
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.3.13
+VER        = 5.3.27
 
 THISAPP    = php-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,6 +32,10 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+ifeq "$(BUILD_PLATFORM)" "arm"
+       CFLAGS    := $(patsubst -march=%,,$(CFLAGS))
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -42,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 = 370be99c5cdc2e756c82c44d774933c8
+$(DL_FILE)_MD5 = 25ae23a5b9615fe8d33de5b63e1bb788
 idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
 
@@ -75,46 +79,49 @@ $(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) && ./configure --prefix=/usr \
-                                                                                           --sysconfdir=/etc \
-                                                                                           --with-apxs2 \
-                                                                                           --enable-force-cgi-redirect \
-                                                                                           --enable-discard-path \
-                                                                                           --enable-fastcgi \
-                                                                                           --with-config-file-path=/etc \
-                                                                                           --with-openssl \
-                                                                                           --with-kerberos \
-                                                                                           --with-zlib \
-                                                                                           --enable-bcmath \
-                                                                                           --with-bz2 \
-                                                                                           --enable-calendar \
-                                                                                           --with-curl \
-                                                                                           --with-curlwrappers \
-                                                                                           --enable-dba=shared \
-                                                                                           --with-gdbm \
-                                                                                           --with-db4 \
-                                                                                           --with-inifile \
-                                                                                           --with-flatfile \
-                                                                                           --enable-exif \
-                                                                                           --enable-ftp \
-                                                                                           --with-openssl-dir=/usr \
-                                                                                           --with-gd=/usr \
-                                                                                           --with-jpeg-dir=/usr \
-                                                                                           --with-png-dir=/usr \
-                                                                                           --with-zlib-dir=/usr \
-                                                                                           --with-freetype-dir=/usr \
-                                                                                           --with-gettext \
-                                                                                           --with-gmp \
-                                                                                           --enable-mbstring \
-                                                                                           --with-mysql \
-                                                                                           --with-mysql-sock=/var/run/mysql \
-                                                                                           --with-ncurses \
-                                                                                           --with-pdo-mysql \
-                                                                                           --without-pdo-sqlite \
-                                                                                           --with-readline \
-                                                                                           --enable-sockets \
-                                                                                           --with-xsl \
-                                                                                           --with-iconv
+            --sysconfdir=/etc \
+            --with-apxs2 \
+            --enable-force-cgi-redirect \
+            --enable-discard-path \
+            --enable-fastcgi \
+            --with-config-file-path=/etc \
+            --with-openssl \
+            --with-kerberos \
+            --with-zlib \
+            --enable-bcmath \
+            --with-bz2 \
+            --enable-calendar \
+            --with-curl \
+            --with-curlwrappers \
+            --enable-dba=shared \
+            --with-gdbm \
+            --with-db4 \
+            --with-inifile \
+            --with-flatfile \
+            --enable-exif \
+            --enable-ftp \
+            --with-openssl-dir=/usr \
+            --with-gd=/usr \
+            --with-jpeg-dir=/usr \
+            --with-png-dir=/usr \
+            --with-zlib-dir=/usr \
+            --with-freetype-dir=/usr \
+            --with-gettext \
+            --with-gmp \
+            --enable-mbstring \
+            --with-mysql \
+            --with-mysql-sock=/var/run/mysql \
+            --with-ncurses \
+            --with-pdo-mysql \
+            --with-pdo-sqlite \
+            --with-readline \
+            --enable-sockets \
+            --with-xsl \
+            --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