Removed sandbox/-fstack-protector warning

5 files changed, 14 insertions, 32 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 2ddd4e828fca..5eaf33534a8e 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.72 2003/07/29 14:11:52 coronalvr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.73 2003/07/31 20:19:23 frogger Exp $
+
+  31 Jul 2003; <matt@gentoo.org> glibc-2.3.2-r1.ebuild, glibc-2.3.2-r2.ebuild,
+  glibc-2.3.2-r3.ebuild:
+  Removed warning from 2.3.2 ebuilds regarding
+  sandbox and -fstack-protector.  This was only
+  a problem with 2.3.1.
 
   29 Jul 2003; Alex Veber <coronalvr@gentoo.org> glibc-2.3.2-r1.ebuild:
   removed the winex block
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 3f51aee98bda..0f724ad81734 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,9 +1,9 @@
-MD5 fd7ce1806083d97091272872065a733d ChangeLog 15054
+MD5 96d1346520537a610bbe463051ee30f3 ChangeLog 15052
 MD5 7264bd42315cd6e06b489d9dd3f88404 glibc-2.2.5-r8.ebuild 9706
 MD5 5cf2ad2ae0b712b0fd0b8659e6334a46 glibc-2.3.1-r4.ebuild 10393
-MD5 adb9747c4036738f07fff488283cf1a7 glibc-2.3.2-r1.ebuild 16038
-MD5 b79840f383bc9294e93d22744066e800 glibc-2.3.2-r2.ebuild 16506
-MD5 f6e4fb4cd820c71ff7fd8f906dd794a8 glibc-2.3.2-r3.ebuild 16221
+MD5 77f77b7ee2f15ef8b2c3dcfc2b391b50 glibc-2.3.2-r1.ebuild 16036
+MD5 e949896f2afa79516630fc1eea3edb44 glibc-2.3.2-r2.ebuild 16507
+MD5 1c08496db6bdf9f9a7843788dff99dfc glibc-2.3.2-r3.ebuild 16222
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r8 143
 MD5 439cce38dd07f6669b9bb50f0c211b41 files/digest-glibc-2.3.1-r4 141
 MD5 6b4ab93e3890f58e0845bbe51923eeb1 files/digest-glibc-2.3.2-r1 205
diff --git a/sys-libs/glibc/glibc-2.3.2-r1.ebuild b/sys-libs/glibc/glibc-2.3.2-r1.ebuild
index 7a06111c1377..8a0f2b0d3aa3 100644
--- a/sys-libs/glibc/glibc-2.3.2-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.2-r1.ebuild,v 1.18 2003/07/29 14:11:52 coronalvr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r1.ebuild,v 1.19 2003/07/31 20:19:23 frogger Exp $
 
 IUSE="nls pic build nptl"
 
@@ -181,14 +181,6 @@ pkg_setup() {
 		die "GCC too old"
 	fi
 
-        if [ -n "`is-flag "-fstack-protector"`" -a -n "`has "sandbox" $FEATURES`" ]
-        then
-                eerror "You have both -fstack-protector and sandbox enabled"
-                eerror "glibc will not compile correctly with both of these enabled"
-                eerror "Please disable sandbox by calling emerge with FEATURES=\"-sandbox\""
-                die
-        fi
-
 	if use_nptl
 	then
 		echo
diff --git a/sys-libs/glibc/glibc-2.3.2-r2.ebuild b/sys-libs/glibc/glibc-2.3.2-r2.ebuild
index 813ca62592f8..05a73eba9c7d 100644
--- a/sys-libs/glibc/glibc-2.3.2-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.2-r2.ebuild,v 1.8 2003/07/24 18:17:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r2.ebuild,v 1.9 2003/07/31 20:19:23 frogger Exp $
 
 IUSE="nls pic build nptl"
 
@@ -200,14 +200,6 @@ pkg_setup() {
 		die "GCC too old"
 	fi
 
-	if [ -n "`is-flag "-fstack-protector"`" -a -n "`has "sandbox" $FEATURES`" ]
-	then
-		eerror "You have both -fstack-protector and sandbox enabled"
-		eerror "glibc will not compile correctly with both of these enabled"
-		eerror "Please disable sandbox by calling emerge with FEATURES=\"-sandbox\""
-		die "Have -fstack-protector and sandbox enabled"
-	fi
-
 	if use_nptl
 	then
 		echo
diff --git a/sys-libs/glibc/glibc-2.3.2-r3.ebuild b/sys-libs/glibc/glibc-2.3.2-r3.ebuild
index 8bffe0507ebb..7a7281bc984a 100644
--- a/sys-libs/glibc/glibc-2.3.2-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.2-r3.ebuild,v 1.3 2003/07/28 01:42:13 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r3.ebuild,v 1.4 2003/07/31 20:19:23 frogger Exp $
 
 IUSE="nls pic build nptl"
 
@@ -205,14 +205,6 @@ pkg_setup() {
 		die "GCC too old"
 	fi
 
-	if [ -n "`is-flag "-fstack-protector"`" -a -n "`has "sandbox" $FEATURES`" ]
-	then
-		eerror "You have both -fstack-protector and sandbox enabled"
-		eerror "glibc will not compile correctly with both of these enabled"
-		eerror "Please disable sandbox by calling emerge with FEATURES=\"-sandbox\""
-		die "Have -fstack-protector and sandbox enabled"
-	fi
-
 	if use_nptl
 	then
 		echo