2005-02-24 Ralf Corsepius <ralf.corsepius@rtems.org>

* gcc3newlib/gccnewlib.add, gcc3newlib/mkspec.in, setup.def:
	Add gcc_suffix. Add newlib_suffix.

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.

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
 

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} 

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