public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4ec728f840372f61d61c5019d766f453231eb706
Date: Sun, 12 Jan 2014 11:56:34 +0100	[thread overview]
Message-ID: <20140112105651.8E68D20ACD@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2431 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  4ec728f840372f61d61c5019d766f453231eb706 (commit)
      from  ad33c5fd5988835a5fe78bb2ce4cf5187c899e4d (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 4ec728f840372f61d61c5019d766f453231eb706
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Jan 12 09:45:12 2014 +0100

    Revert "toolchain: Fix compiling due to Stack Protector changes."
    
    This reverts commit 1dbe439b83315f413c94f7c1726cdd44d7f2f838.

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

Summary of changes:
 lfs/gcc   |  3 ---
 lfs/glibc | 13 -------------
 2 files changed, 16 deletions(-)

Difference in files:
diff --git a/lfs/gcc b/lfs/gcc
index 0264d37..a9f124b 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -97,9 +97,6 @@ else
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
-
-  # Disable stack protection in toolchain.
-  CFLAGS += -fno-stack-protector
 endif
 
 ifeq "$(MACHINE_TYPE)" "arm"
diff --git a/lfs/glibc b/lfs/glibc
index b09fcd6..9acbb11 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -281,21 +281,8 @@ endif
 	cd $(DIR_SRC)/glibc-build && \
 		CFLAGS="$(CFLAGS) -fno-asynchronous-unwind-tables" \
 		$(DIR_APP)/configure $(EXTRA_CONFIG)
-
-	sed -i $(DIR_SRC)/glibc-build/config.make \
-		-e "s/^build-pic-default=.*/build-pic-default=yes/"
-
-	# Build the glibc libraries without stack protection (as this is not supported)
-	echo "build-programs=no" >> $(DIR_SRC)/glibc-build/configparms
-	cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
-		CFLAGS="$(CFLAGS) -fno-stack-protector -U_FORTIFY_SOURCE" \
-		CXXFLAGS="$(CXXFLAGS) -fno-stack-protector -U_FORTIFY_SOURCE"
-
-	# Build the programs with hardening
-	: > $(DIR_SRC)/glibc-build/configparms
 	cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
 		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
-
 	cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install
 
 ifeq "$(ROOT)" ""


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

                 reply	other threads:[~2014-01-12 10:56 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140112105651.8E68D20ACD@argus.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox