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

Package-Manager: portage-2.1.3.9

6 files changed, 63 insertions, 28 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/Manifest b/dev-util/cmake/Manifest
index a4470184861a..7b48db40b2b2 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50cmake-gentoo.el 244 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 SHA1 c34102f3343980275169144b40af6ec69a87d7fc SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00
 MD5 4281be81193a1c2ce2ae715da96208e0 files/50cmake-gentoo.el 244
 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 files/50cmake-gentoo.el 244
@@ -40,30 +43,30 @@ EBUILD cmake-2.4.5.ebuild 1029 RMD160 b570cd414095bafd28bf5f568fb50e86d17367fa S
 MD5 5271cc962687b49d31584bd0b387488f cmake-2.4.5.ebuild 1029
 RMD160 b570cd414095bafd28bf5f568fb50e86d17367fa cmake-2.4.5.ebuild 1029
 SHA256 97a727ee4883161648e45198b912d1e2da24f331141f9c652b7cb37dcde2684b cmake-2.4.5.ebuild 1029
-EBUILD cmake-2.4.6-r1.ebuild 1832 RMD160 6bd06029845cad231e074a369aa11dc7a7312b8e SHA1 6614355a5df049a4481d653a2cfbd4cbeef6a3bf SHA256 739a4498518411cc54536ef9bc3162b7d68d32b96077a5772d2eace84a95eb8b
-MD5 fda43b576d4c9e2060e5b26cd74fe7c5 cmake-2.4.6-r1.ebuild 1832
-RMD160 6bd06029845cad231e074a369aa11dc7a7312b8e cmake-2.4.6-r1.ebuild 1832
-SHA256 739a4498518411cc54536ef9bc3162b7d68d32b96077a5772d2eace84a95eb8b cmake-2.4.6-r1.ebuild 1832
+EBUILD cmake-2.4.6-r1.ebuild 1937 RMD160 f2241e1fa80ef9b3aa06ca20341ca9297daa0522 SHA1 aec4a809d9312eca315109a2a61e31b28e365502 SHA256 dbe8a53b25ef44763300e256eda9032c90920e30fe8ad4a13cbe3fb1cedd078b
+MD5 585af37f7baddd60dad14003480d3334 cmake-2.4.6-r1.ebuild 1937
+RMD160 f2241e1fa80ef9b3aa06ca20341ca9297daa0522 cmake-2.4.6-r1.ebuild 1937
+SHA256 dbe8a53b25ef44763300e256eda9032c90920e30fe8ad4a13cbe3fb1cedd078b cmake-2.4.6-r1.ebuild 1937
 EBUILD cmake-2.4.6.ebuild 1031 RMD160 e8cdb2eb27b8c2aa86583f4387de723447603763 SHA1 7b0ae91aa16c9c0e1f8b69d63fc58798dde69a71 SHA256 780237c97b404ea9944d32e9772e132457d7c4b9628196efd34422870fe87c22
 MD5 1f0647b93acbf8cc628cb0b6f7eaa292 cmake-2.4.6.ebuild 1031
 RMD160 e8cdb2eb27b8c2aa86583f4387de723447603763 cmake-2.4.6.ebuild 1031
 SHA256 780237c97b404ea9944d32e9772e132457d7c4b9628196efd34422870fe87c22 cmake-2.4.6.ebuild 1031
-EBUILD cmake-2.4.7-r1.ebuild 2006 RMD160 976e15864053cc755b06ec4c2d871713ed74fda8 SHA1 93155ec35e6c62df15c7b93add84589a806da884 SHA256 f9e34f1c620a4729930860e0cc5587856e8dcdada6f0b51670f25187b24b3937
-MD5 824452b61ac35f958b9ffd173395c0d6 cmake-2.4.7-r1.ebuild 2006
-RMD160 976e15864053cc755b06ec4c2d871713ed74fda8 cmake-2.4.7-r1.ebuild 2006
-SHA256 f9e34f1c620a4729930860e0cc5587856e8dcdada6f0b51670f25187b24b3937 cmake-2.4.7-r1.ebuild 2006
-EBUILD cmake-2.4.7-r2.ebuild 2378 RMD160 9162a4bce86dd12d7d8d306163ea4b04b3c0c1c5 SHA1 073f3a6b1327ba4c6efb25e0a26eff1b21ca40e4 SHA256 553ea94d469f12cadd5af1800bf5a3a5ca78a8436751cdf2f5fe8bb3eed39aa2
-MD5 a7783f1903a10aca279c532aa4d8017a cmake-2.4.7-r2.ebuild 2378
-RMD160 9162a4bce86dd12d7d8d306163ea4b04b3c0c1c5 cmake-2.4.7-r2.ebuild 2378
-SHA256 553ea94d469f12cadd5af1800bf5a3a5ca78a8436751cdf2f5fe8bb3eed39aa2 cmake-2.4.7-r2.ebuild 2378
-EBUILD cmake-2.4.7.ebuild 1856 RMD160 dbe7e8ec0c821bbb1cdd832f25de49788b7bbc37 SHA1 d9f5379d0ee3f36161f06b7bc0bcbcfbc047ad8d SHA256 04d071fefb525e46f7a6a25c71cd8e84570dc0334ceb9a4cd53938af2692771b
-MD5 b1ce1ad476d22b0dbbfa17a3ba22f95b cmake-2.4.7.ebuild 1856
-RMD160 dbe7e8ec0c821bbb1cdd832f25de49788b7bbc37 cmake-2.4.7.ebuild 1856
-SHA256 04d071fefb525e46f7a6a25c71cd8e84570dc0334ceb9a4cd53938af2692771b cmake-2.4.7.ebuild 1856
-MISC ChangeLog 9678 RMD160 6c242d4ce8f1230e1dbefd2d0d57a61dd649f0ba SHA1 8aedcd84ce966813e18e20c0b7047612d4cf554c SHA256 dfc2ca3b8c2f6fbaf898523117dad24116c6c3ab7052b980da41052429bb46c6
-MD5 c92567988289da71a31eba8335f40663 ChangeLog 9678
-RMD160 6c242d4ce8f1230e1dbefd2d0d57a61dd649f0ba ChangeLog 9678
-SHA256 dfc2ca3b8c2f6fbaf898523117dad24116c6c3ab7052b980da41052429bb46c6 ChangeLog 9678
+EBUILD cmake-2.4.7-r1.ebuild 2107 RMD160 a382d8e58f6bac1857faa10825079047133a20e7 SHA1 203af1117b391a6e1561c39f6e961881539a36df SHA256 67e610ddd89a8f395655d82503594ba83b17fe85f939fe78cbc86d16c15e49ec
+MD5 23250662c2c37d2267e20e075164a648 cmake-2.4.7-r1.ebuild 2107
+RMD160 a382d8e58f6bac1857faa10825079047133a20e7 cmake-2.4.7-r1.ebuild 2107
+SHA256 67e610ddd89a8f395655d82503594ba83b17fe85f939fe78cbc86d16c15e49ec cmake-2.4.7-r1.ebuild 2107
+EBUILD cmake-2.4.7-r2.ebuild 2466 RMD160 806d68ce4f8db21a0726b10b64f85627fec209ba SHA1 25486e816608cc7c5446427637a897574b282179 SHA256 9df6c2d05c6431668f53960ac68d89543edcd58dabe6976a2083e8f535875d6c
+MD5 f20448a7516355d416024d06260ab63d cmake-2.4.7-r2.ebuild 2466
+RMD160 806d68ce4f8db21a0726b10b64f85627fec209ba cmake-2.4.7-r2.ebuild 2466
+SHA256 9df6c2d05c6431668f53960ac68d89543edcd58dabe6976a2083e8f535875d6c cmake-2.4.7-r2.ebuild 2466
+EBUILD cmake-2.4.7.ebuild 1957 RMD160 3558a2540c5e57f3b745a27cc72d1ac605676401 SHA1 998ccb0b5292e92df7da30cba89331dcb1bb2abe SHA256 60991b36ffd7c44f75f20e9dc2996b308ec98775de7dfff548b224a531fbe694
+MD5 b9525f8ac209124b5973a9c4b1a9b2fc cmake-2.4.7.ebuild 1957
+RMD160 3558a2540c5e57f3b745a27cc72d1ac605676401 cmake-2.4.7.ebuild 1957
+SHA256 60991b36ffd7c44f75f20e9dc2996b308ec98775de7dfff548b224a531fbe694 cmake-2.4.7.ebuild 1957
+MISC ChangeLog 9908 RMD160 ca36ebe71846f3c15a5390d6fb1b41747df7c591 SHA1 9c4faf9162d75980cd6576bb0223154feb950b93 SHA256 55f0bbbef219dbf8f521add5de08c3aaa100916a88e8f0b3fb2ab9d55be73250
+MD5 7cb673d5a5eb2b07f0d95585e0e557f0 ChangeLog 9908
+RMD160 ca36ebe71846f3c15a5390d6fb1b41747df7c591 ChangeLog 9908
+SHA256 55f0bbbef219dbf8f521add5de08c3aaa100916a88e8f0b3fb2ab9d55be73250 ChangeLog 9908
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 MD5 bc5757868e9f06d6048259da3a5918aa metadata.xml 157
 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb metadata.xml 157
@@ -95,3 +98,10 @@ SHA256 c38ada811d01fc940e3984afba6671ca5477f67293007796798af3f75ce27e07 files/di
 MD5 5e292f9a81c05fe721f316e78ff770d8 files/digest-cmake-2.4.7-r2 238
 RMD160 9a282ff0296c16f7620409705f5b488c19eee1ce files/digest-cmake-2.4.7-r2 238
 SHA256 c38ada811d01fc940e3984afba6671ca5477f67293007796798af3f75ce27e07 files/digest-cmake-2.4.7-r2 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHDSelyuNVb5qfaOYRAnLNAJ92cDqy0WaJfzIm6gq6S9cHpdxfcwCeKAlN
+p4qy+zrxHe8VA/3/nMXyFG4=
+=TPiL
+-----END PGP SIGNATURE-----
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 \