mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-04-23 02:13:38 +00:00
Use CT_DoExecLog when building tools and debug utilities.
/trunk/scripts/build/tools/200-sstrip.sh | 12 6 6 0 ++++++------ /trunk/scripts/build/debug/100-dmalloc.sh | 10 5 5 0 +++++----- /trunk/scripts/build/debug/400-ltrace.sh | 5 3 2 0 +++-- /trunk/scripts/build/debug/300-gdb.sh | 30 17 13 0 +++++++++++++++++------------- /trunk/scripts/build/debug/500-strace.sh | 7 4 3 0 ++++--- /trunk/scripts/build/debug/200-duma.sh | 5 3 2 0 +++-- 6 files changed, 38 insertions(+), 31 deletions(-)
This commit is contained in:
parent
e377769fb1
commit
6e1b1ccb7d
@ -40,19 +40,19 @@ do_debug_dmalloc_build() {
|
||||
|
||||
LD="${CT_TARGET}-ld" \
|
||||
AR="${CT_TARGET}-ar" \
|
||||
CT_DoExecLog ALL \
|
||||
"${CT_SRC_DIR}/dmalloc-${CT_DMALLOC_VERSION}/configure" \
|
||||
--prefix=/usr \
|
||||
--build="${CT_BUILD}" \
|
||||
--host="${CT_TARGET}" \
|
||||
${extra_config} 2>&1 |CT_DoLog ALL
|
||||
${extra_config}
|
||||
|
||||
CT_DoLog EXTRA "Building dmalloc"
|
||||
make 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL make 2>&1 |CT_DoLog ALL
|
||||
|
||||
CT_DoLog EXTRA "Installing dmalloc"
|
||||
make DESTDIR="${CT_SYSROOT_DIR}" installincs \
|
||||
installlib 2>&1 |CT_DoLog ALL
|
||||
make DESTDIR="${CT_DEBUG_INSTALL_DIR}" installutil 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" installincs installlib
|
||||
CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" installutil
|
||||
|
||||
CT_EndStep
|
||||
}
|
||||
|
@ -43,15 +43,16 @@ do_debug_duma_build() {
|
||||
[ "${CT_DUMA_SO}" = "y" ] && libs="${libs} ${duma_so}"
|
||||
libs="${libs# }"
|
||||
CT_DoLog EXTRA "Building libraries '${libs}'"
|
||||
CT_DoExecLog ALL \
|
||||
make HOSTCC="${CT_CC_NATIVE}" \
|
||||
HOSTCXX="${CT_CC_NATIVE}" \
|
||||
CC="${CT_TARGET}-gcc" \
|
||||
CXX="${CT_TARGET}-gcc" \
|
||||
RANLIB="${CT_TARGET}-ranlib" \
|
||||
DUMA_CPP="${DUMA_CPP}" \
|
||||
${libs} 2>&1 |CT_DoLog ALL
|
||||
${libs}
|
||||
CT_DoLog EXTRA "Installing libraries '${libs}'"
|
||||
install -m 644 ${libs} "${CT_SYSROOT_DIR}/usr/lib" 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL install -m 644 ${libs} "${CT_SYSROOT_DIR}/usr/lib"
|
||||
if [ "${CT_DUMA_SO}" = "y" ]; then
|
||||
CT_DoLog EXTRA "Installing shared library link"
|
||||
ln -vsf ${duma_so} "${CT_SYSROOT_DIR}/usr/lib/libduma.so" 2>&1 |CT_DoLog ALL
|
||||
|
@ -71,19 +71,20 @@ do_debug_gdb_build() {
|
||||
|
||||
CC="${CC_for_gdb}" \
|
||||
LD="${LD_for_gdb}" \
|
||||
CT_DoExecLog ALL \
|
||||
"${gdb_src_dir}/configure" \
|
||||
--build=${CT_BUILD} \
|
||||
--host=${CT_HOST} \
|
||||
--target=${CT_TARGET} \
|
||||
--prefix="${CT_PREFIX_DIR}" \
|
||||
--with-build-sysroot="${CT_SYSROOT_DIR}" \
|
||||
${cross_extra_config} 2>&1 |CT_DoLog ALL
|
||||
${cross_extra_config}
|
||||
|
||||
CT_DoLog EXTRA "Building cross-gdb"
|
||||
make ${PARALLELMFLAGS} 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL make ${PARALLELMFLAGS}
|
||||
|
||||
CT_DoLog EXTRA "Installing cross-gdb"
|
||||
make install 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL make install
|
||||
|
||||
CT_EndStep
|
||||
fi
|
||||
@ -100,6 +101,7 @@ do_debug_gdb_build() {
|
||||
[ "${CT_CC_LANG_CXX}" = "y" ] || ncurses_opts="${ncurses_opts} --without-cxx --without-cxx-binding"
|
||||
[ "${CT_CC_LANG_ADA}" = "y" ] || ncurses_opts="${ncurses_opts} --without-ada"
|
||||
|
||||
CT_DoExecLog ALL \
|
||||
"${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}/configure" \
|
||||
--build=${CT_BUILD} \
|
||||
--host=${CT_TARGET} \
|
||||
@ -111,14 +113,14 @@ do_debug_gdb_build() {
|
||||
--without-sysmouse \
|
||||
--without-progs \
|
||||
--enable-termcap \
|
||||
${ncurses_opts} 2>&1 |CT_DoLog ALL
|
||||
${ncurses_opts}
|
||||
|
||||
CT_DoLog EXTRA "Building ncurses"
|
||||
make ${PARALLELMFLAGS} 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL make ${PARALLELMFLAGS}
|
||||
|
||||
CT_DoLog EXTRA "Installing ncurses"
|
||||
mkdir -p -v "${CT_SYSROOT_DIR}/usr/bin" 2>&1 |CT_DoLog ALL
|
||||
make DESTDIR="${CT_SYSROOT_DIR}" install 2>&1 |CT_DoLog ALL
|
||||
mkdir -p "${CT_SYSROOT_DIR}/usr/bin"
|
||||
CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" install
|
||||
|
||||
CT_EndStep
|
||||
|
||||
@ -150,6 +152,7 @@ do_debug_gdb_build() {
|
||||
|
||||
CC="${CC_for_gdb}" \
|
||||
LD="${LD_for_gdb}" \
|
||||
CT_DoExecLog ALL \
|
||||
"${gdb_src_dir}/configure" \
|
||||
--build=${CT_BUILD} \
|
||||
--host=${CT_TARGET} \
|
||||
@ -164,13 +167,13 @@ do_debug_gdb_build() {
|
||||
--disable-werror \
|
||||
--without-included-gettext \
|
||||
--without-develop \
|
||||
${native_extra_config} 2>&1 |CT_DoLog ALL
|
||||
${native_extra_config}
|
||||
|
||||
CT_DoLog EXTRA "Building native gdb"
|
||||
make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC} 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC}
|
||||
|
||||
CT_DoLog EXTRA "Installing native gdb"
|
||||
make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install
|
||||
|
||||
# Building a native gdb also builds a gdbserver
|
||||
find "${CT_DEBUG_INSTALL_DIR}" -type f -name gdbserver -exec rm -fv {} + 2>&1 |CT_DoLog ALL
|
||||
@ -200,6 +203,7 @@ do_debug_gdb_build() {
|
||||
gdbserver_extra_config="${extra_config}"
|
||||
|
||||
LDFLAGS="${gdbserver_LDFLAGS}" \
|
||||
CT_DoExecLog ALL \
|
||||
"${gdb_src_dir}/gdb/gdbserver/configure" \
|
||||
--build=${CT_BUILD} \
|
||||
--host=${CT_TARGET} \
|
||||
@ -216,13 +220,13 @@ do_debug_gdb_build() {
|
||||
--without-x \
|
||||
--without-included-gettext \
|
||||
--without-develop \
|
||||
${gdbserver_extra_config} 2>&1 |CT_DoLog ALL
|
||||
${gdbserver_extra_config}
|
||||
|
||||
CT_DoLog EXTRA "Building gdbserver"
|
||||
make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC} 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC}
|
||||
|
||||
CT_DoLog EXTRA "Installing gdbserver"
|
||||
make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install
|
||||
|
||||
CT_EndStep
|
||||
fi
|
||||
|
@ -27,16 +27,17 @@ do_debug_ltrace_build() {
|
||||
CT_DoLog EXTRA "Configuring ltrace"
|
||||
# CFLAGS="-I${CT_SYSROOT_DIR}/usr/include" \
|
||||
# LDFLAGS="-L${CT_SYSROOT_DIR}/usr/include" \
|
||||
CT_DoExecLog ALL \
|
||||
"${CT_SRC_DIR}/ltrace-${CT_LTRACE_VERSION}/configure" \
|
||||
--build=${CT_BUILD} \
|
||||
--host=${CT_TARGET} \
|
||||
--prefix=/usr
|
||||
|
||||
CT_DoLog EXTRA "Building ltrace"
|
||||
make
|
||||
CT_DoExecLog ALL make
|
||||
|
||||
CT_DoLog EXTRA "Installing ltrace"
|
||||
make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install
|
||||
CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install
|
||||
|
||||
CT_Popd
|
||||
CT_EndStep
|
||||
|
@ -21,16 +21,17 @@ do_debug_strace_build() {
|
||||
CT_Pushd "${CT_BUILD_DIR}/build-strace"
|
||||
|
||||
CT_DoLog EXTRA "Configuring strace"
|
||||
CT_DoExecLog ALL \
|
||||
"${CT_SRC_DIR}/strace-${CT_STRACE_VERSION}/configure" \
|
||||
--build=${CT_BUILD} \
|
||||
--host=${CT_TARGET} \
|
||||
--prefix=/usr 2>&1 |CT_DoLog ALL
|
||||
--prefix=/usr
|
||||
|
||||
CT_DoLog EXTRA "Building strace"
|
||||
make 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL make
|
||||
|
||||
CT_DoLog EXTRA "Installing strace"
|
||||
make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL make DESTDIR="${CT_DEBUG_INSTALL_DIR}" install
|
||||
|
||||
CT_Popd
|
||||
CT_EndStep
|
||||
|
@ -21,10 +21,10 @@ case "${CT_SSTRIP_FROM}" in
|
||||
( cd "${CT_SRC_DIR}/ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}/sstrip"; tar cf - . ) |tar xf -
|
||||
|
||||
CT_DoLog EXTRA "Building sstrip"
|
||||
make CC="${CT_CC_NATIVE}" sstrip 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL make CC="${CT_CC_NATIVE}" sstrip
|
||||
|
||||
CT_DoLog EXTRA "Installing sstrip"
|
||||
install -m 755 sstrip "${CT_PREFIX_DIR}/bin/${CT_TARGET}-sstrip" 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL install -m 755 sstrip "${CT_PREFIX_DIR}/bin/${CT_TARGET}-sstrip"
|
||||
|
||||
CT_EndStep
|
||||
}
|
||||
@ -60,14 +60,14 @@ case "${CT_SSTRIP_FROM}" in
|
||||
mv -v sstrip.c?* sstrip.c 2>&1 |CT_DoLog DEBUG
|
||||
if [ "${CT_SAVE_TARBALLS}" = "y" ]; then
|
||||
CT_DoLog EXTRA "Saving 'sstrip.c' to local storage"
|
||||
cp -v sstrip.c "${CT_LOCAL_TARBALLS_DIR}" 2>&1 |CT_DoLog DEBUG
|
||||
CT_DoExecLog ALL cp -v sstrip.c "${CT_LOCAL_TARBALLS_DIR}"
|
||||
fi
|
||||
CT_Popd
|
||||
}
|
||||
do_tools_sstrip_extract() {
|
||||
# We'll let buildroot guys take care of sstrip maintenance and patching.
|
||||
mkdir -p "${CT_SRC_DIR}/sstrip"
|
||||
cp -v "${CT_TARBALLS_DIR}/sstrip.c" "${CT_SRC_DIR}/sstrip" |CT_DoLog ALL
|
||||
CT_DoExecLog ALL cp -v "${CT_TARBALLS_DIR}/sstrip.c" "${CT_SRC_DIR}/sstrip"
|
||||
}
|
||||
do_tools_sstrip_build() {
|
||||
CT_DoStep INFO "Installing sstrip"
|
||||
@ -75,10 +75,10 @@ case "${CT_SSTRIP_FROM}" in
|
||||
cd "${CT_BUILD_DIR}/build-sstrip"
|
||||
|
||||
CT_DoLog EXTRA "Building sstrip"
|
||||
${CT_CC_NATIVE} -Wall -o sstrip "${CT_SRC_DIR}/sstrip/sstrip.c" 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL ${CT_CC_NATIVE} -Wall -o sstrip "${CT_SRC_DIR}/sstrip/sstrip.c"
|
||||
|
||||
CT_DoLog EXTRA "Installing sstrip"
|
||||
install -m 755 sstrip "${CT_PREFIX_DIR}/bin/${CT_TARGET}-sstrip" 2>&1 |CT_DoLog ALL
|
||||
CT_DoExecLog ALL install -m 755 sstrip "${CT_PREFIX_DIR}/bin/${CT_TARGET}-sstrip"
|
||||
|
||||
CT_EndStep
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user