diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-24 06:33:57 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-24 06:33:57 +0000 |
| commit | 233186ac352b667b7f31ee41de54bba34d681d56 (patch) | |
| tree | a3b2fa6f50b650b992fbcce0500f32be236743f4 | |
| parent | 2005-02-22 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-233186ac352b667b7f31ee41de54bba34d681d56.tar.bz2 | |
2005-02-24 Ralf Corsepius <ralf.corsepius@rtems.org>
* gcc3newlib/gccnewlib.add, gcc3newlib/mkspec.in, setup.def:
Add gcc_suffix. Add newlib_suffix.
| -rw-r--r-- | scripts/ChangeLog | 5 | ||||
| -rw-r--r-- | scripts/gcc3newlib/gccnewlib.add | 10 | ||||
| -rw-r--r-- | scripts/gcc3newlib/mkspec.in | 2 | ||||
| -rw-r--r-- | scripts/setup.def | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 2dfd8e0d71..470fadee4a 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +2005-02-24 Ralf Corsepius <ralf.corsepius@rtems.org> + + * gcc3newlib/gccnewlib.add, gcc3newlib/mkspec.in, setup.def: + Add gcc_suffix. Add newlib_suffix. + 2005-02-16 Ralf Corsepius <ralf.corsepius@rtems.org> * autotools/automake-rtems.spec.in: automake-1.9.5. diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add index 9644cceb00..61b2e5089b 100644 --- a/scripts/gcc3newlib/gccnewlib.add +++ b/scripts/gcc3newlib/gccnewlib.add @@ -17,7 +17,7 @@ Packager: ralf.corsepius@rtems.org and joel@OARcorp.com Version: gcc%{gcc_version}newlib%{newlib_version} %if "%{gcc_version}" >= "3.2.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_version}.tar.bz2 +Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_version}@gcc_suffix@ %else %if "%{gcc_version}" >= "3.0" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_version}.tar.gz @@ -25,7 +25,7 @@ Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_version}.tar Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_version}-everything.tar.gz %endif %endif -Source1: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz +Source1: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}@newlib_suffix@ @PATCH1@ @PATCH3@ BuildPreReq: texinfo >= 4.2 @@ -65,9 +65,9 @@ NoSource: 1 %endif -%define build_cxx 1 -%define build_g77 0 -%define build_objc 0 +%define build_cxx %{?cxx:%cxx}%{!?cxx:1} +%define build_g77 %{?g77:%g77}%{!?g77:0} +%define build_objc %{?objc:%objc}%{!?objc:0} %define build_gcj 0 %define build_gnat 0 diff --git a/scripts/gcc3newlib/mkspec.in b/scripts/gcc3newlib/mkspec.in index aa9abd675b..8aa0ff80d9 100644 --- a/scripts/gcc3newlib/mkspec.in +++ b/scripts/gcc3newlib/mkspec.in @@ -75,6 +75,8 @@ sed -e "s,@PATCH1\@,${PATCH1}," \ -e "s,@rpm_build_root\@,${rpm_build_root},g" \ -e "s%@gcc_version\@%${gcc3_version}%g" \ -e "s%@gcc_patch_version\@%${gcc3_patch_version}%g" \ + -e "s%@gcc_suffix\@%${gcc3_suffix}%g" \ -e "s%@newlib_version\@%${gcc3newlib_version}%g" \ -e "s%@newlib_patch_version\@%${gcc3newlib_patch_version}%g" \ + -e "s%@newlib_suffix\@%${gcc3newlib_suffix}%g" \ < ${specsrc} diff --git a/scripts/setup.def b/scripts/setup.def index e3640450d3..d9b36f24cf 100644 --- a/scripts/setup.def +++ b/scripts/setup.def @@ -13,8 +13,10 @@ rtems_version=ss-20000726 rtems_rpm_release=1 rpm_build_root=%{_tmppath} gcc3newlib_version=1.12.0 +gcc3newlib_suffix=.tar.gz gcc3newlib_patch_version= gcc3_version=3.3.5 +gcc3_suffix=.tar.gz gcc3_patch_version=20041030 gcc3newlib_rpm_release=2 # gcc3_version=3.4.0 |