Changeset c610055c in rtems


Ignore:
Timestamp:
Apr 12, 2005, 7:51:07 AM (15 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
dad59e4
Parents:
c974e32
Message:

Use gcc_* instead of gcc3_* for setup.* values.

Location:
scripts
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • scripts/configure.ac

    rc974e32 rc610055c  
    5757AC_MSG_RESULT($RPM_CPU)
    5858
    59 GCC3NEWLIBVERS="gcc-${gcc3_version}-newlib-${gcc3newlib_version}"
     59GCC3NEWLIBVERS="gcc-${gcc_version}-newlib-${gcc3newlib_version}"
    6060AC_SUBST(GCC3NEWLIBVERS)
    6161BINUTILSVERS="binutils-${binutils_version}"
  • scripts/gcc3newlib/mkspec.in

    rc974e32 rc610055c  
    5050
    5151patchn=-1
    52 if test -n "${gcc3_patch_version}"; then
     52if test -n "${gcc_patch_version}"; then
    5353patchn=`expr $patchn + 1`
    54 PATCH1="Patch${patchn}: gcc-${gcc3_version}-rtems-${gcc3_patch_version}.diff"
     54PATCH1="Patch${patchn}: gcc-${gcc_version}-rtems-${gcc_patch_version}.diff"
    5555fi
    5656
     
    7070    -e "s%@osversion\@%@osversion@%g" \
    7171    -e "s,@rpm_build_root\@,${rpm_build_root},g" \
    72     -e "s%@gcc_version\@%${gcc3_version}%g" \
    73     -e "s%@gcc_patch_version\@%${gcc3_patch_version}%g" \
    74     -e "s%@gcc_suffix\@%${gcc3_suffix}%g" \
     72    -e "s%@gcc_version\@%${gcc_version}%g" \
     73    -e "s%@gcc_patch_version\@%${gcc_patch_version}%g" \
     74    -e "s%@gcc_suffix\@%${gcc_suffix}%g" \
    7575    -e "s%@newlib_version\@%${gcc3newlib_version}%g" \
    7676    -e "s%@newlib_patch_version\@%${gcc3newlib_patch_version}%g" \
  • scripts/setup

    rc974e32 rc610055c  
    3333  echo "c rtems rpm release       : $rtems_rpm_release"
    3434  echo "d rpm build root          : $rpm_build_root"
    35   echo "e gcc3 version             : $gcc3_version"
    36   echo "f gcc3 patch version       : $gcc3_patch_version"
     35  echo "e gcc3 version             : $gcc_version"
     36  echo "f gcc3 patch version       : $gcc_patch_version"
    3737  echo "g gcc3 newlib version      : $gcc3newlib_version"
    3838  echo "h gcc3 newlib patch version: $gcc3newlib_patch_version"
     
    6262     read rpm_build_root ;;
    6363  e) echo -n "GCC3 source >"
    64      read gcc3_version ;;
     64     read gcc_version ;;
    6565  f) echo -n "GCC3 patch version>"
    66      read gcc3_patch_version ;;
     66     read gcc_patch_version ;;
    6767  g) echo -n "NEWLIB source >"
    6868     read gcc3newlib_version ;;
     
    9999echo "gcc3newlib_version=$gcc3newlib_version" >> $CFG
    100100echo "gcc3newlib_patch_version=$gcc3newlib_patch_version" >> $CFG
    101 echo "gcc3_version=$gcc3_version" >> $CFG
    102 echo "gcc3_patch_version=$gcc3_patch_version" >> $CFG
     101echo "gcc_version=$gcc_version" >> $CFG
     102echo "gcc_patch_version=$gcc_patch_version" >> $CFG
    103103echo "gcc3newlib_rpm_release=$gcc3newlib_rpm_release" >> $CFG
    104104
  • scripts/setup.def

    rc974e32 rc610055c  
    1717gcc3newlib_suffix=.tar.gz
    1818gcc3newlib_patch_version=
    19 gcc3_version=3.3.5
    20 gcc3_suffix=.tar.gz
    21 gcc3_patch_version=20041030
     19gcc_version=3.3.5
     20gcc_suffix=.tar.gz
     21gcc_patch_version=20041030
    2222gcc3newlib_rpm_release=2
    23 # gcc3_version=3.4.0
    24 # gcc3_patch_version=20040522a
    25 # gcc3newlib_rpm_release=2
Note: See TracChangeset for help on using the changeset viewer.