From a8bd1dea77a27cabb59afe9621ad5649b18cd8ab Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 13 Sep 2001 13:35:35 +0000 Subject: 2001-09-13 Joel Sherrill * mkgccnewlibspec.in, Use Target_alias not target_alias to avoid conflicts with new autoconf. * setup.def: Changed version numbers in attempt at building gcc 3.0.1. Only sparc and arm built for C/C++ OK. :( * gccnewlib/base-gcc.add: Modifications to reflect files not in gcc 3.x. * gccnewlib/gccnewlib.add: gcc 3.x does not have "everything in the name" * target-gcc.add: Modifications to reflect files not in gcc 3.1 --- scripts/ChangeLog | 10 ++++++++++ scripts/gccnewlib/base-gcc.add | 8 ++++++-- scripts/gccnewlib/gccnewlib.add | 5 ++++- scripts/gccnewlib/target-gcc.add | 5 +++-- scripts/mkgccnewlibspec.in | 4 ++-- scripts/setup.def | 4 ++-- 6 files changed, 27 insertions(+), 9 deletions(-) (limited to 'scripts') diff --git a/scripts/ChangeLog b/scripts/ChangeLog index c5f1d75118..e1f311c1dc 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,13 @@ +2001-09-13 Joel Sherrill + + * mkgccnewlibspec.in, + Use Target_alias not target_alias to avoid conflicts with new autoconf. + * setup.def: Changed version numbers in attempt at building gcc 3.0.1. + Only sparc and arm built for C/C++ OK. :( + * gccnewlib/base-gcc.add: Modifications to reflect files not in gcc 3.x. + * gccnewlib/gccnewlib.add: gcc 3.x does not have "everything in the name" + * target-gcc.add: Modifications to reflect files not in gcc 3.1 + 2001-09-13 Joel Sherrill * autotools/.cvsignore: New file. diff --git a/scripts/gccnewlib/base-gcc.add b/scripts/gccnewlib/base-gcc.add index 61b97ccea7..b005b02926 100644 --- a/scripts/gccnewlib/base-gcc.add +++ b/scripts/gccnewlib/base-gcc.add @@ -24,10 +24,14 @@ This is the files for gcc and newlib that are shared by all targets. %dir /opt/rtems/man %dir /opt/rtems/man/man1 -%doc /opt/rtems/man/man1/cccp.1 +# not in gcc 3.x -- only in gcc 2.x +# %doc /opt/rtems/man/man1/cccp.1 %dir /opt/rtems/include -/opt/rtems/include/g++-3 +# gcc 3.0.1 specific +/opt/rtems/include/g++-v3 +# gcc 2.x specific +# /opt/rtems/include/g++-3 %post -n rtems-base-gcc if test -d $RPM_INSTALL_PREFIX/rtems/info; diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add index 54ee65698d..9f0573dff6 100644 --- a/scripts/gccnewlib/gccnewlib.add +++ b/scripts/gccnewlib/gccnewlib.add @@ -18,7 +18,10 @@ Autoreqprov: on Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com Version: gcc@gcc_version@newlib@newlib_version@ -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-everything-@gcc_version@.tar.gz +# gcc 3.x and gcc 2.9 +Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.bz2 +# gcc 2.95.x +#Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-everything-@gcc_version@.tar.bz2 Source1: ftp://sourceware.cygnus.com/pub/newlib/newlib-@newlib_version@.tar.gz Patch0: gcc-@gcc_version@-rtems-@gcc_patch_version@.diff Patch1: newlib-@newlib_version@-rtems-@newlib_patch_version@.diff diff --git a/scripts/gccnewlib/target-gcc.add b/scripts/gccnewlib/target-gcc.add index d147b8738b..27c80ed5e0 100644 --- a/scripts/gccnewlib/target-gcc.add +++ b/scripts/gccnewlib/target-gcc.add @@ -20,8 +20,9 @@ This is gcc and newlib C Library for @target_alias@. /opt/rtems/bin/@target_alias@-c++@exe_ext@ /opt/rtems/bin/@target_alias@-g++@exe_ext@ /opt/rtems/bin/@target_alias@-gcc@exe_ext@ -/opt/rtems/bin/@target_alias@-protoize@exe_ext@ -/opt/rtems/bin/@target_alias@-unprotoize@exe_ext@ +# not in gcc 3.x +# /opt/rtems/bin/@target_alias@-protoize@exe_ext@ +# /opt/rtems/bin/@target_alias@-unprotoize@exe_ext@ %dir /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include diff --git a/scripts/mkgccnewlibspec.in b/scripts/mkgccnewlibspec.in index a6ff84b465..013f4d71b7 100644 --- a/scripts/mkgccnewlibspec.in +++ b/scripts/mkgccnewlibspec.in @@ -55,10 +55,10 @@ target_alias=$1 . ./$CFG -specfile=${dst}/$target_alias-gcc-${gcc_version}-newlib-${newlib_version}.spec +specfile=${dst}/${target_alias}-gcc-${gcc_version}-newlib-${newlib_version}.spec sed -e "s%@Release@%${gccnewlib_rpm_release}%g" \ - -e "s%@target_alias@%${target_alias}%g" \ + -e "s%@Target_alias@%${target_alias}%g" \ -e "s%@rpm_build_root@%${rpm_build_root}%g" \ -e "s%@gcc_version@%${gcc_version}%g" \ -e "s%@gcc_patch_version@%${gcc_patch_version}%g" \ diff --git a/scripts/setup.def b/scripts/setup.def index e2757837f9..bb7cce6b27 100644 --- a/scripts/setup.def +++ b/scripts/setup.def @@ -8,8 +8,8 @@ binutils_patch_version=NA-BUILDING-GCC binutils_rpm_release=3 newlib_version=1.9.0 newlib_patch_version=20010622 -gcc_version=2.95.3 -gcc_patch_version=20010622a +gcc_version=3.0.1 +gcc_patch_version=20010905 gccnewlib_rpm_release=1 gdb_version=5.0 gdb_patch_version=20010314 -- cgit v1.2.3