ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-19 12:57:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scripts: add "FILE" and "CFG" debug levels.

Browse Source 
I ran into some minor difficulties looking through the build log for a
particular file: I wasn't interested in seeing it unpacked, but only
when it is built or installed.  Adding these two levels allows me to
differentiate between those cases.

[Yann E. MORIN: Those are blind log levels, and are used only to search
 in the build-log afterward.]

Signed-off-by: Anthony Foiani <anthony.foiani@gmail.com>
This commit is contained in:
Anthony Foiani 2010-10-22 22:02:57 +02:00
parent 2b912ba840
commit 92898249bd
24 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build/binutils/binutils.sh
View File

@ -26,7 +26,7 @@ do_binutils() {
CT_DoLog EXTRA "Configuring binutils"
CFLAGS="${CT_CFLAGS_FOR_HOST}" \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \

2
scripts/build/binutils/elf2flt.sh
View File

@ -38,7 +38,7 @@ do_elf2flt() {
CT_DoLog EXTRA "Configuring elf2flt"
CFLAGS="${CT_CFLAGS_FOR_HOST}" \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/elf2flt-cvs-${CT_ELF2FLT_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \

12
scripts/build/cc/gcc.sh
View File

@ -203,7 +203,7 @@ do_cc_core() {
CC_FOR_BUILD="${CT_BUILD}-gcc" \
CFLAGS="${CT_CFLAGS_FOR_HOST}" \
LDFLAGS="${core_LDFLAGS}" \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \
@ -237,17 +237,17 @@ do_cc_core() {
# Next we have to configure gcc, create libgcc.mk then edit it...
# So much easier if we just edit the source tree, but hey...
if [ ! -f "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" ]; then
CT_DoExecLog ALL make configure-libiberty
CT_DoExecLog CFG make configure-libiberty
CT_DoExecLog ALL make ${PARALLELMFLAGS} -C libiberty libiberty.a
CT_DoExecLog ALL make configure-gcc configure-libcpp
CT_DoExecLog CFG make configure-gcc configure-libcpp
CT_DoExecLog ALL make ${PARALLELMFLAGS} all-libcpp
else
CT_DoExecLog ALL make configure-gcc configure-libcpp configure-build-libiberty
CT_DoExecLog CFG make configure-gcc configure-libcpp configure-build-libiberty
CT_DoExecLog ALL make ${PARALLELMFLAGS} all-libcpp all-build-libiberty
fi
# HACK: gcc-4.2 uses libdecnumber to build libgcc.mk, so build it here.
if [ -d "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/libdecnumber" ]; then
CT_DoExecLog ALL make configure-libdecnumber
CT_DoExecLog CFG make configure-libdecnumber
CT_DoExecLog ALL make ${PARALLELMFLAGS} -C libdecnumber libdecnumber.a
fi
@ -455,7 +455,7 @@ do_cc() {
CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \

2
scripts/build/companion_libs/cloog.sh
View File

@ -60,7 +60,7 @@ do_cloog() {
CFLAGS="${CT_CFLAGS_FOR_HOST}" \
LDFLAGS="${cloog_LDFLAGS}" \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/cloog-ppl${_t}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \

2
scripts/build/companion_libs/gmp.sh
View File

@ -37,7 +37,7 @@ do_gmp() {
fi
CFLAGS="${CT_CFLAGS_FOR_HOST} -fexceptions" \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \

2
scripts/build/companion_libs/libelf.sh
View File

@ -36,7 +36,7 @@ do_libelf() {
libelf_opts+=( --disable-shared --enable-static )
fi
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/libelf-${CT_LIBELF_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \

2
scripts/build/companion_libs/mpc.sh
View File

@ -38,7 +38,7 @@ do_mpc() {
fi
CFLAGS="${CT_CFLAGS_FOR_HOST}" \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/mpc-${CT_MPC_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \

2
scripts/build/companion_libs/mpfr.sh
View File

@ -88,7 +88,7 @@ do_mpfr() {
CT_DoLog EXTRA "Configuring MPFR"
CC="${CT_HOST}-gcc" \
CFLAGS="${CT_CFLAGS_FOR_HOST}" \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \

2
scripts/build/companion_libs/ppl.sh
View File

@ -41,7 +41,7 @@ do_ppl() {
CFLAGS="${CT_CFLAGS_FOR_HOST}" \
CXXFLAGS="${CT_CFLAGS_FOR_HOST}" \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/ppl-${CT_PPL_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \

2
scripts/build/companion_tools/100-m4.sh
View File

@ -17,7 +17,7 @@ do_companion_tools_m4_build() {
mkdir -p "${CT_BUILD_DIR}/build-m4"
CT_Pushd "${CT_BUILD_DIR}/build-m4"
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/m4-${CT_M4_VERSION}/configure" \
--prefix="${CT_TOOLS_OVERIDE_DIR}"
CT_DoExecLog ALL make

2
scripts/build/companion_tools/200-autoconf.sh
View File

@ -22,7 +22,7 @@ do_companion_tools_autoconf_build() {
# For reference see:
# http://www.gnu.org/software/autoconf/manual/autoconf.html#CONFIG_005fSHEL
CT_DoExecLog ALL ${CONFIG_SHELL} \
CT_DoExecLog CFG ${CONFIG_SHELL} \
"${CT_SRC_DIR}/autoconf-${CT_AUTOCONF_VERSION}/configure" \
--prefix="${CT_TOOLS_OVERIDE_DIR}"
CT_DoExecLog ALL make

2
scripts/build/companion_tools/300-automake.sh
View File

@ -17,7 +17,7 @@ do_companion_tools_automake_build() {
mkdir -p "${CT_BUILD_DIR}/build-automake"
CT_Pushd "${CT_BUILD_DIR}/build-automake"
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/automake-${CT_AUTOMAKE_VERSION}/configure" \
--prefix="${CT_TOOLS_OVERIDE_DIR}"
CT_DoExecLog ALL make

2
scripts/build/companion_tools/400-libtool.sh
View File

@ -17,7 +17,7 @@ do_companion_tools_libtool_build() {
mkdir -p "${CT_BUILD_DIR}/build-libtool"
CT_Pushd "${CT_BUILD_DIR}/build-libtool"
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/libtool-${CT_LIBTOOL_VERSION}/configure" \
--prefix="${CT_TOOLS_OVERIDE_DIR}"
CT_DoExecLog ALL make

2
scripts/build/debug/000-template.sh
View File

@ -20,7 +20,7 @@ do_debug_foobar_build() {
# For example:
# mkdir -p "${CT_BUILD_DIR}/build-foobar"
# CT_Pushd "${CT_BUILD_DIR}/build-foobar"
# CT_DoExecLog ALL \
# CT_DoExecLog CFG \
# "${CT_SRC_DIR}/foobar-${CT_FOOBAR_VERSION}/configure" \
# --build=${CT_BUILD} \
# --host=${CT_TARGET} \

2
scripts/build/debug/100-dmalloc.sh
View File

@ -36,7 +36,7 @@ do_debug_dmalloc_build() {
LD="${CT_TARGET}-ld" \
AR="${CT_TARGET}-ar" \
CFLAGS=-fPIC \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/dmalloc-${CT_DMALLOC_VERSION}/configure" \
--prefix=/usr \
--build="${CT_BUILD}" \

12
scripts/build/debug/300-gdb.sh
View File

@ -112,7 +112,7 @@ do_debug_gdb_build() {
CC="${CC_for_gdb}" \
LD="${LD_for_gdb}" \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${gdb_cross_configure}" \
--build=${CT_BUILD} \
--host=${CT_HOST} \
@ -153,7 +153,7 @@ do_debug_gdb_build() {
# Use build = CT_REAL_BUILD so that configure thinks it is
# cross-compiling, and thus will use the ${CT_BUILD}-*
# tools instead of searching for the native ones...
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_BUILD} \
@ -178,7 +178,7 @@ do_debug_gdb_build() {
mkdir -p "${CT_BUILD_DIR}/build-ncurses"
cd "${CT_BUILD_DIR}/build-ncurses"
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
@ -211,7 +211,7 @@ do_debug_gdb_build() {
mkdir -p "${CT_BUILD_DIR}/expat-build"
cd "${CT_BUILD_DIR}/expat-build"
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/expat-${CT_DEBUG_GDB_EXPAT_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
@ -251,7 +251,7 @@ do_debug_gdb_build() {
CC="${CC_for_gdb}" \
LD="${LD_for_gdb}" \
CFLAGS="${gdb_native_CFLAGS[@]}" \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${gdb_src_dir}/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
@ -313,7 +313,7 @@ do_debug_gdb_build() {
gdbserver_extra_config=("${extra_config[@]}")
LDFLAGS="${gdbserver_LDFLAGS}" \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${gdb_src_dir}/gdb/gdbserver/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \

4
scripts/build/debug/400-ltrace.sh
View File

@ -38,9 +38,9 @@ do_debug_ltrace_build() {
CC="${CT_TARGET}-${CT_CC}" \
HOST="${ltrace_host}" \
CFLAGS="${CT_TARGET_CFLAGS}" \
CT_DoExecLog ALL ./configure --prefix=/usr
CT_DoExecLog CFG ./configure --prefix=/usr
else
CT_DoExecLog ALL \
CT_DoExecLog CFG \
./configure \
--build=${CT_BUILD} \
--host=${CT_TARGET} \

2
scripts/build/debug/500-strace.sh
View File

@ -17,7 +17,7 @@ do_debug_strace_build() {
CT_Pushd "${CT_BUILD_DIR}/build-strace"
CT_DoLog EXTRA "Configuring strace"
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/strace-${CT_STRACE_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \

4
scripts/build/libc/eglibc.sh
View File

@ -203,7 +203,7 @@ do_libc_start_files() {
CXX=${cross_cxx} \
AR=${cross_ar} \
RANLIB=${cross_ranlib} \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}/configure" \
--prefix=/usr \
--with-headers="${CT_HEADERS_DIR}" \
@ -311,7 +311,7 @@ do_libc() {
CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \
AR=${CT_TARGET}-ar \
RANLIB=${CT_TARGET}-ranlib \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}/configure" \
--prefix=/usr \
--with-headers="${CT_HEADERS_DIR}" \

6
scripts/build/libc/glibc.sh
View File

@ -130,7 +130,7 @@ do_libc_headers() {
libc_cv_mlong_double_128=yes \
libc_cv_mlong_double_128ibm=yes \
CC=${cross_cc} \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}/configure" \
--build="${CT_BUILD}" \
--host="${CT_TARGET}" \
@ -302,7 +302,7 @@ do_libc_start_files() {
CC="${cross_cc} ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \
AR=${CT_TARGET}-ar \
RANLIB=${CT_TARGET}-ranlib \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}/configure" \
--prefix=/usr \
--build="${CT_BUILD}" \
@ -441,7 +441,7 @@ do_libc() {
CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \
AR=${CT_TARGET}-ar \
RANLIB=${CT_TARGET}-ranlib \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}/configure" \
--prefix=/usr \
--build=${CT_BUILD} \

6
scripts/build/libc/mingw.sh
View File

@ -63,7 +63,7 @@ do_libc() {
CFLAGS="-I${CT_HEADERS_DIR}" \
LDFLAGS="-L${CT_SYSROOT_DIR}/lib" \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32/configure" \
--prefix=${CT_SYSROOT_DIR} \
--includedir=${CT_HEADERS_DIR} \
@ -82,7 +82,7 @@ do_libc() {
CFLAGS="-I${CT_HEADERS_DIR}" \
LDFLAGS="-L${CT_SYSROOT_DIR}/lib" \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/configure" \
--prefix=${CT_SYSROOT_DIR}/ \
--includedir=${CT_HEADERS_DIR} \
@ -138,7 +138,7 @@ do_libc_finish() {
cd "${CT_BUILD_DIR}/build-gnurx"
CFLAGS="${CT_CFLAGS_FOR_TARGET}" \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/mingw-libgnurx-${CT_MINGW_GNURX_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \

2
scripts/build/libc/newlib.sh
View File

@ -75,7 +75,7 @@ do_libc_start_files() {
CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS} -O" \
AR=${CT_TARGET}-ar \
RANLIB=${CT_TARGET}-ranlib \
CT_DoExecLog ALL \
CT_DoExecLog CFG \
"${CT_SRC_DIR}/newlib-$(libc_newlib_version)/configure" \
--host=${CT_BUILD} \
--target=${CT_TARGET} \

2
scripts/build/libc/uClibc.sh
View File

@ -190,7 +190,7 @@ do_libc() {
# to best fit the target. So it is useless and seems to be a bad thing to
# use LIBC_EXTRA_CFLAGS here.
CT_DoLog EXTRA "Applying configuration"
CT_DoYes "" |CT_DoExecLog ALL \
CT_DoYes "" |CT_DoExecLog CFG \
make CROSS=${CT_TARGET}- \
PREFIX="${CT_SYSROOT_DIR}/" \
LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \

16
scripts/functions
View File

@ -49,8 +49,10 @@ CT_LOG_LEVEL_ERROR=0
CT_LOG_LEVEL_WARN=1
CT_LOG_LEVEL_INFO=2
CT_LOG_LEVEL_EXTRA=3
CT_LOG_LEVEL_ALL=4
CT_LOG_LEVEL_DEBUG=5
CT_LOG_LEVEL_CFG=4
CT_LOG_LEVEL_FILE=5
CT_LOG_LEVEL_ALL=6
CT_LOG_LEVEL_DEBUG=7
# Make it easy to use \n and !
CR=$(printf "\n")
@ -63,6 +65,8 @@ BANG='!'
# - INFO: Informational messages
# - EXTRA: Extra informational messages
# - DEBUG: Debug messages
# - CFG: Output of various "./configure"-type scripts
# - FILE: File / archive unpacking.
# - ALL: Component's build messages
# Usage: CT_DoLog <level> [message]
# If message is empty, then stdin will be logged.
@ -671,9 +675,9 @@ CT_Extract() {
CT_DoLog EXTRA "Extracting '${basename}'"
case "${ext}" in
.tar.bz2) CT_DoExecLog ALL tar xvjf "${full_file}";;
.tar.gz|.tgz) CT_DoExecLog ALL tar xvzf "${full_file}";;
.tar) CT_DoExecLog ALL tar xvf "${full_file}";;
.tar.bz2) CT_DoExecLog FILE tar xvjf "${full_file}";;
.tar.gz|.tgz) CT_DoExecLog FILE tar xvzf "${full_file}";;
.tar) CT_DoExecLog FILE tar xvf "${full_file}";;
/.git) CT_ExtractGit "${basename}" "${@}";;
*) CT_Abort "Don't know how to handle '${basename}${ext}': unknown extension";;
esac
@ -729,7 +733,7 @@ CT_ExtractGit() {
case "${ref_type}" in
none) ;;
*) CT_DoExecLog ALL git checkout "${ref}";;
*) CT_DoExecLog FILE git checkout "${ref}";;
esac
CT_Popd