diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2018-12-05 10:51:16 -0800 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2018-12-05 10:51:16 -0800 |
| commit | 2861ee4fde97d0afafc506380c5deaf71c8439ac (patch) | |
| tree | da7abab189a4ac1cd857e69f1b5405a5ed3eba15 | |
| parent | 3a67e1a6b4430374f3073e51bb19347d4c421cfe (diff) | |
| download | binutils-gdb-2861ee4fde97d0afafc506380c5deaf71c8439ac.tar.gz | |
Use separate sed expressions to escape auto-load directories.
Not all sed implementations support alternation via \| in the default
regular expressions. Instead, resort to separate sed expressions via
-e for $debugdir and $datadir. This fixes the default setting of the
auto-load directories on FreeBSD. Previously on FreeBSD the sed
invocation was a no-op causing the debugdir and datadir values to be
expanded yielding an autoload path of ':${prefix}/share/gdb'.
gdb/ChangeLog:
* configure: Re-generate.
* configure.ac: Use separate sed expressions to escape variables
in auto-load directories.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rwxr-xr-x | gdb/configure | 4 | ||||
| -rw-r--r-- | gdb/configure.ac | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index da4d61dc856..d863f918c6b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2018-12-05 John Baldwin <jhb@FreeBSD.org> + + * configure: Re-generate. + * configure.ac: Use separate sed expressions to escape variables + in auto-load directories. + 2018-12-05 Andrew Burgess <andrew.burgess@embecosm.com> * riscv-tdep.c (riscv_features_from_gdbarch_info): New function. diff --git a/gdb/configure b/gdb/configure index 7665ba65319..37772308986 100755 --- a/gdb/configure +++ b/gdb/configure @@ -6579,7 +6579,7 @@ else with_auto_load_dir='$debugdir:$datadir/auto-load' fi -escape_dir=`echo $with_auto_load_dir | sed 's/[$]\(datadir\|debugdir\)\>/\\\\\\\\\\\\&/g'` +escape_dir=`echo $with_auto_load_dir | sed -e 's/[$]datadir\>/\\\\\\\\\\\\&/g' -e 's/[$]debugdir\>/\\\\\\\\\\\\&/g'` test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -6606,7 +6606,7 @@ else with_auto_load_safe_path="$with_auto_load_dir" fi -escape_dir=`echo $with_auto_load_safe_path | sed 's/[$]\(datadir\|debugdir\)\>/\\\\\\\\\\\\&/g'` +escape_dir=`echo $with_auto_load_safe_path | sed -e 's/[$]datadir\>/\\\\\\\\\\\\&/g' -e 's/[$]debugdir\>/\\\\\\\\\\\\&/g'` test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' diff --git a/gdb/configure.ac b/gdb/configure.ac index e1ea60660b9..eca7ea6d41a 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -146,7 +146,7 @@ AC_ARG_WITH(auto-load-dir, AS_HELP_STRING([--with-auto-load-dir=PATH], [directories from which to load auto-loaded scripts @<:@$debugdir:$datadir/auto-load@:>@]),, [with_auto_load_dir='$debugdir:$datadir/auto-load']) -escape_dir=`echo $with_auto_load_dir | sed 's/[[$]]\(datadir\|debugdir\)\>/\\\\\\\\\\\\&/g'` +escape_dir=`echo $with_auto_load_dir | sed -e 's/[[$]]datadir\>/\\\\\\\\\\\\&/g' -e 's/[[$]]debugdir\>/\\\\\\\\\\\\&/g'` AC_DEFINE_DIR(AUTO_LOAD_DIR, escape_dir, [Directories from which to load auto-loaded scripts.]) AC_MSG_RESULT([$with_auto_load_dir]) @@ -161,7 +161,7 @@ AS_HELP_STRING([--without-auto-load-safe-path], with_auto_load_safe_path="/" fi], [with_auto_load_safe_path="$with_auto_load_dir"]) -escape_dir=`echo $with_auto_load_safe_path | sed 's/[[$]]\(datadir\|debugdir\)\>/\\\\\\\\\\\\&/g'` +escape_dir=`echo $with_auto_load_safe_path | sed -e 's/[[$]]datadir\>/\\\\\\\\\\\\&/g' -e 's/[[$]]debugdir\>/\\\\\\\\\\\\&/g'` AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escape_dir, [Directories safe to hold auto-loaded files.]) AC_MSG_RESULT([$with_auto_load_safe_path]) |