Fixing #156800 by issuing -fno-stack-protector if we are having a GCC_MAJOR equal to 3.

(Portage version: 2.1.3.9)

5 files changed, 33 insertions, 8 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 8660425490b3..b0d8acf7aa6c 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cmake
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.64 2007/09/27 18:47:16 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.65 2007/10/10 19:27:27 phreak Exp $
+
+  10 Oct 2007; Christian Heim <phreak@gentoo.org> cmake-2.4.6-r1.ebuild,
+  cmake-2.4.7.ebuild, cmake-2.4.7-r1.ebuild, cmake-2.4.7-r2.ebuild:
+  Fixing #156800 by issuing -fno-stack-protector if we are having a GCC_MAJOR
+  equal to 3.
 
 *cmake-2.4.7-r2 (27 Sep 2007)
 
diff --git a/dev-util/cmake/cmake-2.4.6-r1.ebuild b/dev-util/cmake/cmake-2.4.6-r1.ebuild
index 08a076565075..3b3c63a42d25 100644
--- a/dev-util/cmake/cmake-2.4.6-r1.ebuild
+++ b/dev-util/cmake/cmake-2.4.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.6-r1.ebuild,v 1.9 2007/06/26 18:10:09 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.6-r1.ebuild,v 1.10 2007/10/10 19:27:27 phreak Exp $
 
-inherit elisp-common toolchain-funcs eutils versionator qt3
+inherit elisp-common toolchain-funcs eutils versionator qt3 flag-o-matic
 
 DESCRIPTION="Cross platform Make"
 HOMEPAGE="http://www.cmake.org/"
@@ -24,6 +24,11 @@ VIMFILE="${PN}.vim"
 
 src_compile() {
 	cd ${S}
+
+	if [ "$(gcc-major-version)" -eq "3" ] ; then
+		append-flags "-fno-stack-protector"
+	fi
+
 	tc-export CC CXX LD
 	./bootstrap \
 		--prefix=/usr \
diff --git a/dev-util/cmake/cmake-2.4.7-r1.ebuild b/dev-util/cmake/cmake-2.4.7-r1.ebuild
index 06b61013b004..d610fffbcb24 100644
--- a/dev-util/cmake/cmake-2.4.7-r1.ebuild
+++ b/dev-util/cmake/cmake-2.4.7-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.7-r1.ebuild,v 1.2 2007/10/01 17:23:30 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.7-r1.ebuild,v 1.3 2007/10/10 19:27:27 phreak Exp $
 
-inherit elisp-common toolchain-funcs eutils versionator qt3
+inherit elisp-common toolchain-funcs eutils versionator qt3 flag-o-matic
 
 DESCRIPTION="Cross platform Make"
 HOMEPAGE="http://www.cmake.org/"
@@ -32,6 +32,11 @@ src_unpack() {
 
 src_compile() {
 	cd ${S}
+
+	if [ "$(gcc-major-version)" -eq "3" ] ; then
+		append-flags "-fno-stack-protector"
+	fi
+
 	tc-export CC CXX LD
 	./bootstrap \
 		--prefix=/usr \
diff --git a/dev-util/cmake/cmake-2.4.7-r2.ebuild b/dev-util/cmake/cmake-2.4.7-r2.ebuild
index b50b1be5b3d5..f414cbc90e28 100644
--- a/dev-util/cmake/cmake-2.4.7-r2.ebuild
+++ b/dev-util/cmake/cmake-2.4.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.7-r2.ebuild,v 1.2 2007/10/01 17:23:30 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.7-r2.ebuild,v 1.3 2007/10/10 19:27:27 phreak Exp $
 
 inherit elisp-common toolchain-funcs eutils versionator qt3 flag-o-matic
 
@@ -40,6 +40,11 @@ src_unpack() {
 
 src_compile() {
 	cd "${S}"
+
+	if [ "$(gcc-major-version)" -eq "3" ] ; then
+		append-flags "-fno-stack-protector"
+	fi
+
 	tc-export CC CXX LD
 
 	append-ldflags -Wl,--no-as-needed
diff --git a/dev-util/cmake/cmake-2.4.7.ebuild b/dev-util/cmake/cmake-2.4.7.ebuild
index 1bcc68ca946b..ee42b2138b58 100644
--- a/dev-util/cmake/cmake-2.4.7.ebuild
+++ b/dev-util/cmake/cmake-2.4.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.7.ebuild,v 1.3 2007/10/01 17:23:30 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.7.ebuild,v 1.4 2007/10/10 19:27:27 phreak Exp $
 
-inherit elisp-common toolchain-funcs eutils versionator qt3
+inherit elisp-common toolchain-funcs eutils versionator qt3 flag-o-matic
 
 DESCRIPTION="Cross platform Make"
 HOMEPAGE="http://www.cmake.org/"
@@ -24,6 +24,11 @@ VIMFILE="${PN}.vim"
 
 src_compile() {
 	cd ${S}
+
+	if [ "$(gcc-major-version)" -eq "3" ] ; then
+		append-flags "-fno-stack-protector"
+	fi
+
 	tc-export CC CXX LD
 	./bootstrap \
 		--prefix=/usr \