From 02d0abeff9b16d6ed02936d5f33f0a920d7211ee Mon Sep 17 00:00:00 2001 From: fake Date: Thu, 8 Sep 2005 13:12:25 +0000 Subject: [PATCH] fake: update gcc34 to 3.4.4, adopt patches disable stack protector, no version for 3.4.4 yet [2005081818184620576] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6336 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/gcc/gcc.desc | 6 +++--- package/base/gcc/gcc34/auxbase.patch | 6 +++--- package/base/gcc/gcc34/head-tail.patch | 18 +++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package/base/gcc/gcc.desc b/package/base/gcc/gcc.desc index c057d69fa..87fcc31ac 100644 --- a/package/base/gcc/gcc.desc +++ b/package/base/gcc/gcc.desc @@ -65,9 +65,9 @@ #endif #if xpkg == gcc34.* -[V] 3.4.3 -[D] 215569515 gcc-3.4.3.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.3/ -[D] 870641564 protector-3.4-2.tar.gz http://www.research.ibm.com/trl/projects/security/ssp/gcc3_4/ +[V] 3.4.4 +[D] 1929991607 gcc-3.4.4.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.4/ +#[D] 870641564 protector-3.4-2.tar.gz http://www.research.ibm.com/trl/projects/security/ssp/gcc3_4/ #endif #if xpkg == gcc40 diff --git a/package/base/gcc/gcc34/auxbase.patch b/package/base/gcc/gcc34/auxbase.patch index 9f9ac45c2..5104f8865 100644 --- a/package/base/gcc/gcc34/auxbase.patch +++ b/package/base/gcc/gcc34/auxbase.patch @@ -36,15 +36,15 @@ this for supporting feedback compilation using the ROCK toolchain... || !strcmp (STR, "isystem") || !strcmp (STR, "-param") \ --- ./gcc/gcc.c.orig 2004-09-24 15:44:36.000000000 +0200 +++ ./gcc/gcc.c 2004-09-24 15:48:48.000000000 +0200 -@@ -765,9 +765,9 @@ +@@ -766,9 +766,9 @@ /* NB: This is shared amongst all front-ends. */ static const char *cc1_options = "%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\ - %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*}\ + %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*}\ %{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}%{!c:%{!S:-auxbase %b}}\ -- %{g*} %{O*} %{W*&pedantic*} %{w} %{std*} %{ansi}\ -+ %{a*} %{g*} %{O*} %{W*&pedantic*} %{w} %{std*} %{ansi}\ +- %{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi&trigraphs}\ ++ %{a*} %{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi&trigraphs}\ %{v:-version} %{pg:-p} %{p} %{f*} %{undef}\ %{Qn:-fno-ident} %{--help:--help}\ %{--target-help:--target-help}\ diff --git a/package/base/gcc/gcc34/head-tail.patch b/package/base/gcc/gcc34/head-tail.patch index 75e3a8060..b1ba60e5b 100644 --- a/package/base/gcc/gcc34/head-tail.patch +++ b/package/base/gcc/gcc34/head-tail.patch @@ -134,7 +134,7 @@ diff -dur gcc-3.4.2/libstdc++-v3/aclocal.m4 gcc-3.4.2-p/libstdc++-v3/aclocal.m4 diff -dur gcc-3.4.2/libstdc++-v3/configure gcc-3.4.2-p/libstdc++-v3/configure --- gcc-3.4.2/libstdc++-v3/configure 2004-08-13 22:44:04.000000000 +0200 +++ gcc-3.4.2-p/libstdc++-v3/configure 2004-11-05 02:34:23.000000000 +0100 -@@ -7700,7 +7700,7 @@ +@@ -8168,7 +8168,7 @@ # Start by getting the version number. I think the libtool test already # does some of this, but throws away the result. @@ -143,7 +143,7 @@ diff -dur gcc-3.4.2/libstdc++-v3/configure gcc-3.4.2-p/libstdc++-v3/configure sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` glibcxx_gnu_ld_version=`echo $ldver | \ -@@ -46876,7 +46876,7 @@ +@@ -53531,7 +53531,7 @@ # Start by getting the version number. I think the libtool test already # does some of this, but throws away the result. @@ -152,7 +152,7 @@ diff -dur gcc-3.4.2/libstdc++-v3/configure gcc-3.4.2-p/libstdc++-v3/configure sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` glibcxx_gnu_ld_version=`echo $ldver | \ -@@ -65536,7 +65536,7 @@ +@@ -75201,7 +75201,7 @@ # Start by getting the version number. I think the libtool test already # does some of this, but throws away the result. @@ -161,7 +161,7 @@ diff -dur gcc-3.4.2/libstdc++-v3/configure gcc-3.4.2-p/libstdc++-v3/configure sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` glibcxx_gnu_ld_version=`echo $ldver | \ -@@ -67674,7 +67674,7 @@ +@@ -77569,7 +77569,7 @@ # Start by getting the version number. I think the libtool test already # does some of this, but throws away the result. @@ -170,7 +170,7 @@ diff -dur gcc-3.4.2/libstdc++-v3/configure gcc-3.4.2-p/libstdc++-v3/configure sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` glibcxx_gnu_ld_version=`echo $ldver | \ -@@ -69688,7 +69688,7 @@ +@@ -79813,7 +79813,7 @@ # Start by getting the version number. I think the libtool test already # does some of this, but throws away the result. @@ -179,7 +179,7 @@ diff -dur gcc-3.4.2/libstdc++-v3/configure gcc-3.4.2-p/libstdc++-v3/configure sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` glibcxx_gnu_ld_version=`echo $ldver | \ -@@ -72414,7 +72414,7 @@ +@@ -82825,7 +82825,7 @@ # Start by getting the version number. I think the libtool test already # does some of this, but throws away the result. @@ -188,7 +188,7 @@ diff -dur gcc-3.4.2/libstdc++-v3/configure gcc-3.4.2-p/libstdc++-v3/configure sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` glibcxx_gnu_ld_version=`echo $ldver | \ -@@ -74381,7 +74381,7 @@ +@@ -85022,7 +85022,7 @@ # Start by getting the version number. I think the libtool test already # does some of this, but throws away the result. @@ -197,7 +197,7 @@ diff -dur gcc-3.4.2/libstdc++-v3/configure gcc-3.4.2-p/libstdc++-v3/configure sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` glibcxx_gnu_ld_version=`echo $ldver | \ -@@ -76247,7 +76247,7 @@ +@@ -87110,7 +87110,7 @@ # Start by getting the version number. I think the libtool test already # does some of this, but throws away the result. @@ -206,7 +206,7 @@ diff -dur gcc-3.4.2/libstdc++-v3/configure gcc-3.4.2-p/libstdc++-v3/configure sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` glibcxx_gnu_ld_version=`echo $ldver | \ -@@ -79926,7 +79926,7 @@ +@@ -91165,7 +91165,7 @@ # Start by getting the version number. I think the libtool test already # does some of this, but throws away the result.