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

Use ERROR level for make errors.

Browse Source 
Rename the C library addons directories rather than symlinking.

 /trunk/scripts/functions |   10     7     3     0 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
This commit is contained in:
Yann E. MORIN" 2008-10-12 11:09:57 +00:00
parent c7771e81fa
commit 5276fc869d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/functions
View File

@ -88,7 +88,7 @@ CT_DoLog() {
y,*"warning:"*) cur_L=WARN; cur_l=${CT_LOG_LEVEL_WARN};;
y,*"WARNING:"*) cur_L=WARN; cur_l=${CT_LOG_LEVEL_WARN};;
*"error:"*) cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};;
*"make["?*"]:"*"Stop.") cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};;
*"make["*"]: *** ["*) cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};;
*) cur_L="${LEVEL}"; cur_l="${level}";;
esac
# There will always be a log file (stdout, fd #1), be it /dev/null
@ -596,8 +596,12 @@ CT_ExtractAndPatch() {
# Some addon tarballs directly contain the correct addon directory,
# while others have the addon directory named after the tarball.
# Fix that by always using the short name (eg: linuxthreads, ports, etc...)
addon_short_name=$(echo "${file}" |sed -r -e 's/^[^-]+-//; s/-[^-]+$//;')
[ -d "${addon_short_name}" ] || ln -s "${file}" "${addon_short_name}"
addon_short_name=$(echo "${file}" |sed -r -e 's/^[^-]+-([^-]+)-.*$/\1/;')
if [ ! -d "${addon_short_name}" ]; then
mv "${file}" "${addon_short_name}"
# Keep a symlink to avoid re-extracting later on.
ln -s "${addon_short_name}" "${file}"
fi
# If libc addon, we're already in the correct place
else
cd "${file}"