Changeset 3cba822 in rtems


Ignore:
Timestamp:
Apr 12, 2005, 8:11:11 AM (15 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
76842bf2
Parents:
dad59e4
Message:

Use newlib_* instead of gcc3newlib_* for values from setup.*.

Location:
scripts
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • scripts/configure.ac

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

    rdad59e4 r3cba822  
    5555fi
    5656
    57 if test -n "${gcc3newlib_patch_version}"; then
     57if test -n "${newlib_patch_version}"; then
    5858patchn=`expr $patchn + 1`
    59 PATCH3="Patch${patchn}: newlib-${gcc3newlib_version}-rtems-${gcc3newlib_patch_version}.diff"
     59PATCH3="Patch${patchn}: newlib-${newlib_version}-rtems-${newlib_patch_version}.diff"
    6060fi
    6161
     
    6363sed -e "s,@PATCH1\@,${PATCH1}," \
    6464    -e "s,@PATCH3\@,${PATCH3}," \
    65     -e "s%@Release\@%${gcc3newlib_rpm_release}%g" \
     65    -e "s%@Release\@%${newlib_rpm_release}%g" \
    6666    -e "s%@target_alias\@%${target_alias}%g" \
    6767    -e "s%@prefix\@%@prefix@%g" \
     
    7373    -e "s%@gcc_patch_version\@%${gcc_patch_version}%g" \
    7474    -e "s%@gcc_suffix\@%${gcc_suffix}%g" \
    75     -e "s%@newlib_version\@%${gcc3newlib_version}%g" \
    76     -e "s%@newlib_patch_version\@%${gcc3newlib_patch_version}%g" \
    77     -e "s%@newlib_suffix\@%${gcc3newlib_suffix}%g" \
     75    -e "s%@newlib_version\@%${newlib_version}%g" \
     76    -e "s%@newlib_patch_version\@%${newlib_patch_version}%g" \
     77    -e "s%@newlib_suffix\@%${newlib_suffix}%g" \
    7878< ${specsrc}
  • scripts/setup

    rdad59e4 r3cba822  
    3535  echo "e gcc3 version             : $gcc_version"
    3636  echo "f gcc3 patch version       : $gcc_patch_version"
    37   echo "g gcc3 newlib version      : $gcc3newlib_version"
    38   echo "h gcc3 newlib patch version: $gcc3newlib_patch_version"
     37  echo "g gcc3 newlib version      : $newlib_version"
     38  echo "h gcc3 newlib patch version: $newlib_patch_version"
    3939  echo "i gcc3/newlib rpm release  : $gcc3newlib_rpm_release"
    4040  echo
     
    6666     read gcc_patch_version ;;
    6767  g) echo -n "NEWLIB source >"
    68      read gcc3newlib_version ;;
     68     read newlib_version ;;
    6969  h) echo -n "NEWLIB patch version>"
    70      read gcc3newlib_patch_version ;;
     70     read newlib_patch_version ;;
    7171  i) echo -n "GCC3/NEWLIB RPM release >"
    7272     read gcc3newlib_rpm_release ;;
     
    9797echo "rtems_rpm_release=$rtems_rpm_release" >> $CFG
    9898echo "rpm_build_root=$rpm_build_root" >> $CFG
    99 echo "gcc3newlib_version=$gcc3newlib_version" >> $CFG
    100 echo "gcc3newlib_patch_version=$gcc3newlib_patch_version" >> $CFG
     99echo "newlib_version=$newlib_version" >> $CFG
     100echo "newlib_patch_version=$newlib_patch_version" >> $CFG
    101101echo "gcc_version=$gcc_version" >> $CFG
    102102echo "gcc_patch_version=$gcc_patch_version" >> $CFG
  • scripts/setup.def

    rdad59e4 r3cba822  
    1414rtems_rpm_release=1
    1515rpm_build_root=%{_tmppath}
    16 gcc3newlib_version=1.12.0
    17 gcc3newlib_suffix=.tar.gz
    18 gcc3newlib_patch_version=
     16newlib_version=1.12.0
     17newlib_suffix=.tar.gz
     18newlib_patch_version=
    1919gcc_version=3.3.5
    2020gcc_suffix=.tar.gz
Note: See TracChangeset for help on using the changeset viewer.