Fix addToolVersion.sh after breakage with support for gcc-4.3 (stupid anyway...).
/trunk/tools/addToolVersion.sh | 18 10 8 0 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
1.1 --- a/tools/addToolVersion.sh Mon Jun 09 16:14:23 2008 +0000
1.2 +++ b/tools/addToolVersion.sh Mon Jun 09 16:35:21 2008 +0000
1.3 @@ -81,10 +81,10 @@
1.4
1.5 for ver in ${VERSION}; do
1.6 # Split VERSION into MAJOR MINOR PATCHLEVEL EXTRAVERSION
1.7 - VERSION_M=$(echo "${VERSION}...." |cut -d . -f 1)
1.8 - VERSION_m=$(echo "${VERSION}...." |cut -d . -f 2)
1.9 - VERSION_P=$(echo "${VERSION}...." |cut -d . -f 3)
1.10 - VERSION_E=$(echo "${VERSION}...." |cut -d . -f 4)
1.11 + ver_M=$(echo "${ver}...." |cut -d . -f 1)
1.12 + ver_m=$(echo "${ver}...." |cut -d . -f 2)
1.13 + ver_P=$(echo "${ver}...." |cut -d . -f 3)
1.14 + ver_E=$(echo "${ver}...." |cut -d . -f 4)
1.15 unset DEP L1 L2 L3 L4 L5 L6 FILE
1.16 v=$(echo "${ver}" |sed -r -e 's/-/_/g; s/\./_/g;')
1.17 if [ "${cat}" = "KERNEL" ]; then
1.18 @@ -97,7 +97,7 @@
1.19 sanitised,*) ;; # Sanitised headers always have an extra version
1.20 *,*.*.*.*) DEP="${DEP} && KERNEL_VERSION_SEE_EXTRAVERSION";;
1.21 esac
1.22 - L5=" default \"${ver}\" if ${cat}_${TOOL_SUFFIX}_V_${v}"
1.23 + L6=" default \"${ver}\" if ${cat}_${TOOL_SUFFIX}_V_${v}"
1.24 FILE="config/${tool_prefix}/${tool}_headers_${tool_suffix}.in"
1.25 else
1.26 L1="config ${cat}_V_${v}\n"
1.27 @@ -106,8 +106,8 @@
1.28 L6=" default \"${ver}\" if ${cat}_V_${v}"
1.29 case "${tool}" in
1.30 gcc)
1.31 - if [ ${VERSION_M} -gt 4 -o \( ${VERSION_M} -eq 4 -a ${VERSION_m} -gret 3 i\) ]; then
1.32 - L5=" select CC_GCC_4_3_or_later"
1.33 + if [ ${ver_M} -gt 4 -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \) ]; then
1.34 + L5=" select CC_GCC_4_3_or_later\n"
1.35 fi
1.36 ;;
1.37 esac
1.38 @@ -115,10 +115,12 @@
1.39 fi
1.40 [ -n "${EXP}" ] && DEP="${DEP} && EXPERIMENTAL"
1.41 [ -n "${OBS}" ] && DEP="${DEP} && OBSOLETE"
1.42 + echo "${DEP}"
1.43 case "${DEP}" in
1.44 "") ;;
1.45 - *) L4=" depends on "$(echo "${DEP}" |sed -r -e 's/^ \\&\\& //; s/\\&/\\\\&/g;')"\n"
1.46 + *) L4=" depends on "$(echo "${DEP}" |sed -r -e 's/^ \&\& //; s/\&/\\&/g;')"\n"
1.47 esac
1.48 + echo "${L4}"
1.49 sed -r -i -e 's/^(# CT_INSERT_VERSION_ABOVE)$/'"${L1}${L2}${L3}${L4}${L5}"'\n\1/;
1.50 s/^(# CT_INSERT_VERSION_STRING_ABOVE)$/'"${L6}"'\n\1/;' "${FILE}"
1.51 done