More cleanups: move strip-flags and friends into setup_flags where they belong.

3 files changed, 20 insertions, 34 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 5f912f0e9546..ba9a4c03ae59 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.186 2004/06/11 07:55:24 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.187 2004/06/11 09:46:03 kumba Exp $
+
+  11 Jun 2004; Joshua Kinard <kumba@gentoo.org>
+  glibc-2.3.4.20040605-r1.ebuild:
+  More cleanups: move strip-flags and friends into setup_flags where they belong.
 
   11 Jun 2004; Joshua Kinard <kumba@gentoo.org>
   glibc-2.3.4.20040605-r1.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 60bc99f07129..5bcad4484f77 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,4 +1,4 @@
-MD5 1dd52f0f6abae8728478b0a7049c725b ChangeLog 38745
+MD5 0266e3f53bb940cdcbe8cd308abeaaaa ChangeLog 38910
 MD5 0fa1291bf0fde4988100d42852d25df6 glibc-2.2.5-r9.ebuild 10001
 MD5 6c9ed0aa642c902139be296250465829 glibc-2.3.1-r5.ebuild 10718
 MD5 aaa34484bbb3516cc6b220d8345a60d7 glibc-2.3.2-r10.ebuild 19417
@@ -9,7 +9,7 @@ MD5 488e8b7878e9e8a11be594b3e16ee0f4 glibc-2.3.3_pre20031210.ebuild 19014
 MD5 22ddf107c3e48edbece07166517dbc7a glibc-2.3.3_pre20040117-r1.ebuild 19231
 MD5 67753229fcc7169eb9e648263dfda5f4 glibc-2.3.3_pre20040117.ebuild 18525
 MD5 00f71cf6b178a50ca7792b65ebc1f5bc glibc-2.3.3_pre20040207.ebuild 19593
-MD5 ddea6401e68b3559ffe52a34849eef5c glibc-2.3.4.20040605-r1.ebuild 17486
+MD5 ef26620fc27e01f90caf2aa890c50f00 glibc-2.3.4.20040605-r1.ebuild 16812
 MD5 4a439bb638a3309eb4302b0bdc0153da glibc-2.3.3_pre20040420.ebuild 19886
 MD5 675c7d0b2383a6e09f765dc23e5cfdec glibc-2.3.3_pre20040529.ebuild 21577
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
diff --git a/sys-libs/glibc/glibc-2.3.4.20040605-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040605-r1.ebuild
index e16db09c8502..057427b8127e 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040605-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040605-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040605-r1.ebuild,v 1.2 2004/06/11 07:55:24 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040605-r1.ebuild,v 1.3 2004/06/11 09:46:03 kumba Exp $
 
 IUSE="nls pic build nptl erandom hardened makecheck multilib"
 
@@ -9,35 +9,6 @@ inherit eutils flag-o-matic gcc
 # make check will fail if sandbox is enabled
 export SANDBOX_DISABLED="1"
 
-# Recently there has been a lot of stability problem in Gentoo-land.  Many
-# things can be the cause to this, but I believe that it is due to gcc3
-# still having issues with optimizations, or with it not filtering bad
-# combinations (protecting the user maybe from himeself) yet.
-#
-# This can clearly be seen in large builds like glibc, where too aggressive
-# CFLAGS cause the tests to fail miserbly.
-#
-# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion
-# knows what he is talking about:
-#
-#   People really shouldn't force code-specific options on... It's a
-#   bad idea. The -march options aren't just to look pretty. They enable
-#   options that are sensible (and include sse,mmx,3dnow when apropriate).
-#
-# The next command strips CFLAGS and CXXFLAGS from nearly all flags.  If
-# you do not like it, comment it, but do not bugreport if you run into
-# problems.
-#
-# <azarah@gentoo.org> (13 Oct 2002)
-strip-flags
-strip-unsupported-flags
-
-
-# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
-export CFLAGS="${CFLAGS//-O?} -O2"
-export CXXFLAGS="${CFLAGS}"
-export LDFLAGS="${LDFLAGS//-Wl,--relax}"
-
 
 DESCRIPTION="GNU libc6 (also called glibc2) C library"
 SRC_URI="http://dev.gentoo.org/~lv/${P}.tar.bz2
@@ -70,12 +41,18 @@ PROVIDE="virtual/glibc"
 
 # We need to be able to set alternative headers for
 # compiling for non-native platform
-# Will also come useful for testing kernel-headers without screwing up
+# Will also become useful for testing kernel-headers without screwing up
 # whole system
 [ -z "${ALT_HEADERS}" ] && ALT_HEADERS="/usr/include"
 
 
 setup_flags() {
+	# Over-zealous CFLAGS can often cause problems.  What may work for one person may not
+	# work for another.  To avoid a large influx of bugs relating to failed builds, we 
+	# strip most CFLAGS out to ensure as few problems as possible.
+	strip-flags
+	strip-unsupported-flags
+
 	# -freorder-blocks for all but ppc
 	use ppc || append-flags "-freorder-blocks"
 
@@ -114,6 +91,11 @@ setup_flags() {
 	# We don't want these flags for glibc
 	filter-flags "-fomit-frame-pointer -malign-double"
 	filter-ldflags "-pie"
+
+	# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
+	export CFLAGS="${CFLAGS//-O?} -O2"
+	export CXXFLAGS="${CFLAGS}"
+	export LDFLAGS="${LDFLAGS//-Wl,--relax}"
 }