Merge remote-tracking branch 'origin/next' into thirteen

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

diff --git a/lfs/php b/lfs/php
index e8073ff1309b8e2c51b9265c5b9938058f51a95d..58f442ce4c839dba7c381cb4345f660b151dfba4 100644 (file)
--- a/lfs/php
+++ b/lfs/php
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# 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.3.5
+VER        = 5.3.16
 
 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 = 8aaf20c95e91f25c5b6a591e5d6d61b9
+$(DL_FILE)_MD5 = 99cfd78531643027f60c900e792d21be
 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
 ###############################################################################