ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-02-21 01:21:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix addToolVersion.sh after breakage with support for gcc-4.3 (stupid anyway...).

Browse Source 
/trunk/tools/addToolVersion.sh |   18    10     8     0 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
This commit is contained in:
Yann E. MORIN" 2008-06-09 16:35:21 +00:00
parent 929c368541
commit eab041d31a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/addToolVersion.sh
View File

@ -81,10 +81,10 @@ esac
for ver in ${VERSION}; do
# Split VERSION into MAJOR MINOR PATCHLEVEL EXTRAVERSION
VERSION_M=$(echo "${VERSION}...." |cut -d . -f 1)
VERSION_m=$(echo "${VERSION}...." |cut -d . -f 2)
VERSION_P=$(echo "${VERSION}...." |cut -d . -f 3)
VERSION_E=$(echo "${VERSION}...." |cut -d . -f 4)
ver_M=$(echo "${ver}...." |cut -d . -f 1)
ver_m=$(echo "${ver}...." |cut -d . -f 2)
ver_P=$(echo "${ver}...." |cut -d . -f 3)
ver_E=$(echo "${ver}...." |cut -d . -f 4)
unset DEP L1 L2 L3 L4 L5 L6 FILE
v=$(echo "${ver}" |sed -r -e 's/-/_/g; s/\./_/g;')
if [ "${cat}" = "KERNEL" ]; then
@ -97,7 +97,7 @@ for ver in ${VERSION}; do
sanitised,*) ;; # Sanitised headers always have an extra version
*,*.*.*.*) DEP="${DEP} && KERNEL_VERSION_SEE_EXTRAVERSION";;
esac
L5=" default \"${ver}\" if ${cat}_${TOOL_SUFFIX}_V_${v}"
L6=" default \"${ver}\" if ${cat}_${TOOL_SUFFIX}_V_${v}"
FILE="config/${tool_prefix}/${tool}_headers_${tool_suffix}.in"
else
L1="config ${cat}_V_${v}\n"
@ -106,8 +106,8 @@ for ver in ${VERSION}; do
L6=" default \"${ver}\" if ${cat}_V_${v}"
case "${tool}" in
gcc)
if [ ${VERSION_M} -gt 4 -o \( ${VERSION_M} -eq 4 -a ${VERSION_m} -gret 3 i\) ]; then
L5=" select CC_GCC_4_3_or_later"
if [ ${ver_M} -gt 4 -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \) ]; then
L5=" select CC_GCC_4_3_or_later\n"
fi
;;
esac
@ -115,10 +115,12 @@ for ver in ${VERSION}; do
fi
[ -n "${EXP}" ] && DEP="${DEP} && EXPERIMENTAL"
[ -n "${OBS}" ] && DEP="${DEP} && OBSOLETE"
echo "${DEP}"
case "${DEP}" in
"") ;;
*) L4=" depends on "$(echo "${DEP}" |sed -r -e 's/^ \\&\\& //; s/\\&/\\\\&/g;')"\n"
*) L4=" depends on "$(echo "${DEP}" |sed -r -e 's/^ \&\& //; s/\&/\\&/g;')"\n"
esac
echo "${L4}"
sed -r -i -e 's/^(# CT_INSERT_VERSION_ABOVE)$/'"${L1}${L2}${L3}${L4}${L5}"'\n\1/;
s/^(# CT_INSERT_VERSION_STRING_ABOVE)$/'"${L6}"'\n\1/;' "${FILE}"
done