aboutsummaryrefslogtreecommitdiff
path: root/scripts/build/debug
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/build/debug')
-rw-r--r--scripts/build/debug/000-template.sh4
-rw-r--r--scripts/build/debug/100-dmalloc.sh6
-rw-r--r--scripts/build/debug/200-duma.sh10
-rw-r--r--scripts/build/debug/300-gdb.sh26
-rw-r--r--scripts/build/debug/400-ltrace.sh6
-rw-r--r--scripts/build/debug/500-strace.sh4
6 files changed, 28 insertions, 28 deletions
diff --git a/scripts/build/debug/000-template.sh b/scripts/build/debug/000-template.sh
index d72069bc..47d2caea 100644
--- a/scripts/build/debug/000-template.sh
+++ b/scripts/build/debug/000-template.sh
@@ -26,8 +26,8 @@ do_debug_foobar_build() {
# --host=${CT_TARGET} \
# --prefix=/usr \
# --foobar-options
- # CT_DoExecLog ALL ${make}
- # CT_DoExecLog ALL ${make} DESTDIR="${CT_SYSROOT_DIR}" install
+ # CT_DoExecLog ALL make
+ # CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" install
# CT_Popd
:
}
diff --git a/scripts/build/debug/100-dmalloc.sh b/scripts/build/debug/100-dmalloc.sh
index 1cfbdc0d..ad0d78dd 100644
--- a/scripts/build/debug/100-dmalloc.sh
+++ b/scripts/build/debug/100-dmalloc.sh
@@ -47,11 +47,11 @@ do_debug_dmalloc_build() {
"${extra_config[@]}"
CT_DoLog EXTRA "Building dmalloc"
- CT_DoExecLog ALL ${make}
+ CT_DoExecLog ALL make
CT_DoLog EXTRA "Installing dmalloc"
- CT_DoExecLog ALL ${make} DESTDIR="${CT_SYSROOT_DIR}" installincs installlib
- CT_DoExecLog ALL ${make} DESTDIR="${CT_DEBUGROOT_DIR}" installutil
+ CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" installincs installlib
+ CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" installutil
CT_EndStep
}
diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh
index 4f6a5c3b..0e5291c1 100644
--- a/scripts/build/debug/200-duma.sh
+++ b/scripts/build/debug/200-duma.sh
@@ -24,7 +24,7 @@ do_debug_duma_extract() {
do_debug_duma_build() {
CT_DoStep INFO "Installing D.U.M.A."
CT_DoLog EXTRA "Copying sources"
- cp -a "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}" "${CT_BUILD_DIR}/build-duma"
+ cp -a "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}/." "${CT_BUILD_DIR}/build-duma"
CT_Pushd "${CT_BUILD_DIR}/build-duma"
DUMA_CPP=
@@ -32,7 +32,7 @@ do_debug_duma_build() {
# The shared library needs some love: some version have libduma.so.0.0,
# while others have libduma.so.0.0.0
- duma_so=$(${make} -n -p 2>&1 |${grep} -E '^libduma.so[^:]*:' |head -n 1 |cut -d : -f 1)
+ duma_so=$(make -n -p 2>&1 |grep -E '^libduma.so[^:]*:' |head -n 1 |cut -d : -f 1)
libs=
[ "${CT_DUMA_A}" = "y" ] && libs="${libs} libduma.a"
@@ -40,21 +40,21 @@ do_debug_duma_build() {
libs="${libs# }"
CT_DoLog EXTRA "Building libraries '${libs}'"
CT_DoExecLog ALL \
- ${make} HOSTCC="${CT_BUILD}-gcc" \
+ make HOSTCC="${CT_BUILD}-gcc" \
CC="${CT_TARGET}-gcc" \
CXX="${CT_TARGET}-gcc" \
RANLIB="${CT_TARGET}-ranlib" \
DUMA_CPP="${DUMA_CPP}" \
${libs}
CT_DoLog EXTRA "Installing libraries '${libs}'"
- CT_DoExecLog ALL ${install} -m 644 ${libs} "${CT_SYSROOT_DIR}/usr/lib"
+ 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
CT_DoLog EXTRA "Installing wrapper script"
mkdir -p "${CT_DEBUGROOT_DIR}/usr/bin"
# Install a simpler, smaller, safer wrapper than the one provided by D.U.M.A.
- ${sed} -r -e 's:^LIBDUMA_SO=.*:LIBDUMA_SO=/usr/lib/'"${duma_so}"':;' \
+ sed -r -e 's:^LIBDUMA_SO=.*:LIBDUMA_SO=/usr/lib/'"${duma_so}"':;' \
"${CT_LIB_DIR}/scripts/build/debug/duma.in" \
>"${CT_DEBUGROOT_DIR}/usr/bin/duma"
chmod 755 "${CT_DEBUGROOT_DIR}/usr/bin/duma"
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index d3510d63..ba135911 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -12,10 +12,10 @@ do_debug_gdb_get() {
else
# Account for the Linaro versioning
linaro_version="$( echo "${CT_GDB_VERSION}" \
- |${sed} -r -e 's/^linaro-//;' \
+ |sed -r -e 's/^linaro-//;' \
)"
linaro_series="$( echo "${linaro_version}" \
- |${sed} -r -e 's/-.*//;' \
+ |sed -r -e 's/-.*//;' \
)"
if [ x"${linaro_version}" = x"${CT_GDB_VERSION}" ]; then
@@ -24,7 +24,7 @@ do_debug_gdb_get() {
{http,ftp,https}://ftp.gnu.org/pub/gnu/gdb \
ftp://{sourceware.org,gcc.gnu.org}/pub/gdb/releases
else
- YYMM=`echo ${CT_GDB_VERSION} |cut -d- -f3 |${sed} -e 's,^..,,'`
+ YYMM=`echo ${CT_GDB_VERSION} |cut -d- -f3 |sed -e 's,^..,,'`
CT_GetFile "gdb-${CT_GDB_VERSION}" \
"http://launchpad.net/gdb-linaro/${linaro_series}/${linaro_version}/+download" \
https://releases.linaro.org/${YYMM}/components/toolchain/gdb-linaro \
@@ -135,15 +135,15 @@ do_debug_gdb_build() {
"${CT_GDB_CROSS_EXTRA_CONFIG_ARRAY[@]}"
CT_DoLog EXTRA "Building cross-gdb"
- CT_DoExecLog ALL ${make} ${JOBSFLAGS}
+ CT_DoExecLog ALL make ${JOBSFLAGS}
CT_DoLog EXTRA "Installing cross-gdb"
- CT_DoExecLog ALL ${make} install
+ CT_DoExecLog ALL make install
if [ "${CT_BUILD_MANUALS}" = "y" ]; then
CT_DoLog EXTRA "Building and installing the cross-GDB manuals"
- CT_DoExecLog ALL ${make} ${JOBSFLAGS} pdf html
- CT_DoExecLog ALL ${make} install-{pdf,html}-gdb
+ CT_DoExecLog ALL make ${JOBSFLAGS} pdf html
+ CT_DoExecLog ALL make install-{pdf,html}-gdb
fi
if [ "${CT_GDB_INSTALL_GDBINIT}" = "y" ]; then
@@ -152,11 +152,11 @@ do_debug_gdb_build() {
if [ -f "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/BASE-VER" ]; then
gcc_version=$( cat "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/BASE-VER" )
else
- gcc_version=$(${sed} -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \
+ gcc_version=$(sed -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \
"${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/version.c" \
)
fi
- ${sed} -r \
+ sed -r \
-e "s:@@PREFIX@@:${CT_PREFIX_DIR}:;" \
-e "s:@@VERSION@@:${gcc_version}:;" \
"${CT_LIB_DIR}/scripts/build/debug/gdbinit.in" \
@@ -249,10 +249,10 @@ do_debug_gdb_build() {
"${native_extra_config[@]}"
CT_DoLog EXTRA "Building native gdb"
- CT_DoExecLog ALL ${make} ${JOBSFLAGS} CC=${CT_TARGET}-${CT_CC}
+ CT_DoExecLog ALL make ${JOBSFLAGS} CC=${CT_TARGET}-${CT_CC}
CT_DoLog EXTRA "Installing native gdb"
- CT_DoExecLog ALL ${make} DESTDIR="${CT_DEBUGROOT_DIR}" install
+ CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install
# Building a native gdb also builds a gdbserver
find "${CT_DEBUGROOT_DIR}" -type f -name gdbserver -exec rm -fv {} \; 2>&1 |CT_DoLog ALL
@@ -321,10 +321,10 @@ do_debug_gdb_build() {
"${gdbserver_extra_config[@]}"
CT_DoLog EXTRA "Building gdbserver"
- CT_DoExecLog ALL ${make} ${JOBSFLAGS} CC=${CT_TARGET}-${CT_CC}
+ CT_DoExecLog ALL make ${JOBSFLAGS} CC=${CT_TARGET}-${CT_CC}
CT_DoLog EXTRA "Installing gdbserver"
- CT_DoExecLog ALL ${make} DESTDIR="${CT_DEBUGROOT_DIR}" install
+ CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install
CT_EndStep
fi
diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh
index f8d61441..fdf1e40d 100644
--- a/scripts/build/debug/400-ltrace.sh
+++ b/scripts/build/debug/400-ltrace.sh
@@ -22,7 +22,7 @@ do_debug_ltrace_build() {
CT_DoStep INFO "Installing ltrace"
CT_DoLog EXTRA "Copying sources to build dir"
- CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/ltrace-${CT_LTRACE_VERSION}" \
+ CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/ltrace-${CT_LTRACE_VERSION}/." \
"${CT_BUILD_DIR}/build-ltrace"
CT_Pushd "${CT_BUILD_DIR}/build-ltrace"
@@ -52,10 +52,10 @@ do_debug_ltrace_build() {
fi
CT_DoLog EXTRA "Building ltrace"
- CT_DoExecLog ALL ${make}
+ CT_DoExecLog ALL make
CT_DoLog EXTRA "Installing ltrace"
- CT_DoExecLog ALL ${make} DESTDIR="${CT_DEBUGROOT_DIR}" install
+ CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install
CT_Popd
CT_EndStep
diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh
index 79406a75..0d33ca09 100644
--- a/scripts/build/debug/500-strace.sh
+++ b/scripts/build/debug/500-strace.sh
@@ -28,10 +28,10 @@ do_debug_strace_build() {
--prefix=/usr
CT_DoLog EXTRA "Building strace"
- CT_DoExecLog ALL ${make}
+ CT_DoExecLog ALL make
CT_DoLog EXTRA "Installing strace"
- CT_DoExecLog ALL ${make} DESTDIR="${CT_DEBUGROOT_DIR}" install
+ CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install
CT_Popd
CT_EndStep
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-19 14:14:57 +0000