diff options
| -rw-r--r-- | scripts/configure.ac | 2 | ||||
| -rw-r--r-- | scripts/gcc3newlib/mkspec.in | 10 | ||||
| -rwxr-xr-x | scripts/setup | 12 | ||||
| -rw-r--r-- | scripts/setup.def | 9 |
4 files changed, 15 insertions, 18 deletions
diff --git a/scripts/configure.ac b/scripts/configure.ac index b8216e3d3e..9f73d0c725 100644 --- a/scripts/configure.ac +++ b/scripts/configure.ac @@ -56,7 +56,7 @@ case "$host" in esac AC_MSG_RESULT($RPM_CPU) -GCC3NEWLIBVERS="gcc-${gcc3_version}-newlib-${gcc3newlib_version}" +GCC3NEWLIBVERS="gcc-${gcc_version}-newlib-${gcc3newlib_version}" AC_SUBST(GCC3NEWLIBVERS) BINUTILSVERS="binutils-${binutils_version}" AC_SUBST(BINUTILSVERS) diff --git a/scripts/gcc3newlib/mkspec.in b/scripts/gcc3newlib/mkspec.in index 9c4a6556dd..3a611d1e06 100644 --- a/scripts/gcc3newlib/mkspec.in +++ b/scripts/gcc3newlib/mkspec.in @@ -49,9 +49,9 @@ target_alias=$1 . ./$CFG patchn=-1 -if test -n "${gcc3_patch_version}"; then +if test -n "${gcc_patch_version}"; then patchn=`expr $patchn + 1` -PATCH1="Patch${patchn}: gcc-${gcc3_version}-rtems-${gcc3_patch_version}.diff" +PATCH1="Patch${patchn}: gcc-${gcc_version}-rtems-${gcc_patch_version}.diff" fi if test -n "${gcc3newlib_patch_version}"; then @@ -69,9 +69,9 @@ sed -e "s,@PATCH1\@,${PATCH1}," \ -e "s%@rpmgroup\@%@rpmgroup@%g" \ -e "s%@osversion\@%@osversion@%g" \ -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%@gcc_version\@%${gcc_version}%g" \ + -e "s%@gcc_patch_version\@%${gcc_patch_version}%g" \ + -e "s%@gcc_suffix\@%${gcc_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" \ diff --git a/scripts/setup b/scripts/setup index 448b40b982..565f10b59f 100755 --- a/scripts/setup +++ b/scripts/setup @@ -32,8 +32,8 @@ do echo "b rtems version : $rtems_version" echo "c rtems rpm release : $rtems_rpm_release" echo "d rpm build root : $rpm_build_root" - echo "e gcc3 version : $gcc3_version" - echo "f gcc3 patch version : $gcc3_patch_version" + echo "e gcc3 version : $gcc_version" + echo "f gcc3 patch version : $gcc_patch_version" echo "g gcc3 newlib version : $gcc3newlib_version" echo "h gcc3 newlib patch version: $gcc3newlib_patch_version" echo "i gcc3/newlib rpm release : $gcc3newlib_rpm_release" @@ -61,9 +61,9 @@ do d) echo -n "RPM build root >" read rpm_build_root ;; e) echo -n "GCC3 source >" - read gcc3_version ;; + read gcc_version ;; f) echo -n "GCC3 patch version>" - read gcc3_patch_version ;; + read gcc_patch_version ;; g) echo -n "NEWLIB source >" read gcc3newlib_version ;; h) echo -n "NEWLIB patch version>" @@ -98,8 +98,8 @@ echo "rtems_rpm_release=$rtems_rpm_release" >> $CFG echo "rpm_build_root=$rpm_build_root" >> $CFG echo "gcc3newlib_version=$gcc3newlib_version" >> $CFG echo "gcc3newlib_patch_version=$gcc3newlib_patch_version" >> $CFG -echo "gcc3_version=$gcc3_version" >> $CFG -echo "gcc3_patch_version=$gcc3_patch_version" >> $CFG +echo "gcc_version=$gcc_version" >> $CFG +echo "gcc_patch_version=$gcc_patch_version" >> $CFG echo "gcc3newlib_rpm_release=$gcc3newlib_rpm_release" >> $CFG echo " done" diff --git a/scripts/setup.def b/scripts/setup.def index ae5d00a2e5..f587754a0a 100644 --- a/scripts/setup.def +++ b/scripts/setup.def @@ -16,10 +16,7 @@ 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 +gcc_version=3.3.5 +gcc_suffix=.tar.gz +gcc_patch_version=20041030 gcc3newlib_rpm_release=2 -# gcc3_version=3.4.0 -# gcc3_patch_version=20040522a -# gcc3newlib_rpm_release=2 |