[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5930a368ad783c21e4e5542aea64561f409cbd68

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5930a368ad783c21e4e5542aea64561f409cbd68

[git]

[-- Attachment #1: Type: text/plain, Size: 2446 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  5930a368ad783c21e4e5542aea64561f409cbd68 (commit)
       via  e8546b858c554b10db00f9a3453f2b75c1f943e6 (commit)
      from  c16d97c617b8a7a663f536da61f7b161251c6500 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5930a368ad783c21e4e5542aea64561f409cbd68
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 28 20:21:29 2014 +0200

    squid: Disable -march=native.
    
    This produces a binary that cannot be executed on
    all systems that we support.

commit e8546b858c554b10db00f9a3453f2b75c1f943e6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 28 20:21:01 2014 +0200

    make.sh: Fix variable name that sets the architecture.

-----------------------------------------------------------------------

Summary of changes:
 lfs/squid            | 3 ++-
 tools/make-functions | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/lfs/squid b/lfs/squid
index 1f1589d..e050b17 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -118,7 +118,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--disable-wccpv2 \
 		--enable-icap-client \
 		--disable-esi \
-		--enable-zph-qos
+		--enable-zph-qos \
+		--disable-arch-native
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
diff --git a/tools/make-functions b/tools/make-functions
index 6e9ad6c..ba66547 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -69,13 +69,13 @@ configure_target() {
 
 	case "${target_arch}" in
 		i586)
-			BUILDTARGET="${TARGET_ARCH}-pc-linux-gnu"
+			BUILDTARGET="${target_arch}-pc-linux-gnu"
 			CROSSTARGET="${BUILD_ARCH}-cross-linux-gnu"
 			CFLAGS_ARCH="-march=i586 -fomit-frame-pointer"
 			;;
 
 		armv5tel)
-			BUILDTARGET="${TARGET_ARCH}-unknown-linux-gnueabi"
+			BUILDTARGET="${target_arch}-unknown-linux-gnueabi"
 			CROSSTARGET="${BUILD_ARCH}-cross-linux-gnueabi"
 			CFLAGS_ARCH="-march=armv5te -mfloat-abi=soft -fomit-frame-pointer"
 			MACHINE_TYPE="arm"


hooks/post-receive
--
IPFire 2.x development tree