[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 22a504c69cb578f6e34928f3d862beac635e5224

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 22a504c69cb578f6e34928f3d862beac635e5224

[git]

[-- Attachment #1: Type: text/plain, Size: 3806 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  22a504c69cb578f6e34928f3d862beac635e5224 (commit)
      from  928eba27a5e15074d8e5b7d8b9f6892d122bf40f (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 22a504c69cb578f6e34928f3d862beac635e5224
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Jan 20 19:28:56 2016 +0100

    toolchain: fix build on hosts that not support strong stackprotect
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 lfs/binutils | 3 ++-
 lfs/ccache   | 3 ++-
 lfs/gcc      | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/lfs/binutils b/lfs/binutils
index 402fdfb..5afaeec 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2016  IPFire Team  <info(a)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        #
@@ -46,6 +46,7 @@ else
 ifeq "$(PASS)" "1"
   CFLAGS := $(patsubst -march=%,,$(CFLAGS))
   CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
+  CFLAGS := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CFLAGS))
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \
 	--target=$(CROSSTARGET) \
diff --git a/lfs/ccache b/lfs/ccache
index 64b09d1..682f499 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info(a)ipfire.org>                          #
+# Copyright (C) 2007-2016  IPFire Team  <info(a)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        #
@@ -35,6 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-pass$(PASS)
 ifeq "$(PASS)" "1"
 	CFLAGS := $(patsubst -march=%,,$(CFLAGS))
 	CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
+	CFLAGS := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CFLAGS))
 endif
 
 # Set max cache size to 5GB
diff --git a/lfs/gcc b/lfs/gcc
index 00f64c6..52d1dae 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -59,6 +59,8 @@ ifeq "$(ROOT)" ""
   EXTRA_INSTALL =
 else
 ifeq "$(PASS)" "1"
+  CFLAGS    := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CFLAGS))
+  CXXFLAGS  := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CXXFLAGS))
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \
 	--target=$(CROSSTARGET) \


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