From 7bcf18bfab84374d3305c7a088f95ac1219ddf93 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sun, 12 Feb 2017 18:53:23 -0800
Subject: Determine whether -E/-r option selects extended regexp

... and then use the right option. See the note in scripts/functions
on where we should use ${foo} and where just 'foo'; this boils down to
whether we can expect the build tools override to be in effect (e.g. in
the actual build scripts) or not (i.e. outside of scripts/build).
While running in scripts/functions, or in scripts/crosstool-NG.sh the
build tools override directory (.build/tools/bin) may have not been
set up (yet, or at all).

Also, modify the installed scripts (populate, xldd) accordingly.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 scripts/build/debug/200-duma.sh | 4 ++--
 scripts/build/debug/300-gdb.sh  | 4 ++--
 scripts/build/debug/duma.in     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'scripts/build/debug')

diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh
index 2a9b01f8..3aa1c318 100644
--- a/scripts/build/debug/200-duma.sh
+++ b/scripts/build/debug/200-duma.sh
@@ -48,7 +48,7 @@ do_debug_duma_build() {
     if [ "${CT_DUMA_CUSTOM_WRAPPER}" = "y" ]; then
         # The shared library needs some love: some version have libduma.so.0.0,
         # while others have libduma.so.0.0.0
-        duma_so=$( make "${make_args[@]}" printvars | sed -n -r -e 's/^DUMASO \[(.*)\]$/\1/p' )
+        duma_so=$( make "${make_args[@]}" printvars | sed_r -n -e 's/^DUMASO \[(.*)\]$/\1/p' )
 
         CT_DoLog EXTRA "Installing wrapper script"
         CT_DoExecLog ALL mkdir -p "${CT_DEBUGROOT_DIR}/usr/bin"
@@ -56,7 +56,7 @@ do_debug_duma_build() {
         CT_DoExecLog ALL rm -f "${CT_DEBUGROOT_DIR}/usr/bin/duma"
         CT_DoExecLog ALL cp "${CT_LIB_DIR}/scripts/build/debug/duma.in" \
                             "${CT_DEBUGROOT_DIR}/usr/bin/duma"
-        CT_DoExecLog ALL sed -i -r -e "s:^LIBDUMA_SO=.*:LIBDUMA_SO=/usr/lib/${duma_so}:;" \
+        CT_DoExecLog ALL sed_r -i -e "s:^LIBDUMA_SO=.*:LIBDUMA_SO=/usr/lib/${duma_so}:;" \
                             "${CT_DEBUGROOT_DIR}/usr/bin/duma"
         CT_DoExecLog ALL chmod 755 "${CT_DEBUGROOT_DIR}/usr/bin/duma"
     fi
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index a5ac7f9d..5255c646 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -156,11 +156,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"   \
diff --git a/scripts/build/debug/duma.in b/scripts/build/debug/duma.in
index 90c90136..f69e70b1 100644
--- a/scripts/build/debug/duma.in
+++ b/scripts/build/debug/duma.in
@@ -16,7 +16,7 @@ case "$1" in
     # We use a suposedly POSIX-compliant shell: /bin/sh
     #  -> we can't use "${LD_PRELOAD//${LIBDUMA_SO}/}", it's not POSIX
     # We don't know if sed will be present on the target
-    #  -> we can't use $(echo "${LD_PRELOAD}" |sed -r -e "s|${LIBDUMA_SO}||;")
+    #  -> we can't use $(echo "${LD_PRELOAD}" |${sed_r} -e "s|${LIBDUMA_SO}||;")
     # So, iterate through LD_PRELOAD, and keep only those libs that
     # are not "${LIBDUMA_SO}"
     old_LD_PRELOAD="${LD_PRELOAD}"
-- 
cgit v1.2.3