Re: [PATCH] Tune default DEBUGDIR for NetBSD

[Christian Biesinger <cbiesinger@google.com>]

On Wed, Apr 8, 2020 at 12:16 PM Kamil Rytarowski <n54@gmx.com> wrote:
>
> NetBSD uses a custom debug file directory /usr/libdata/debug
> for the basesystem and does not use separate debug files in
> pkgsrc (3rd party package collections).
>
> gdb/ChangeLog:
>
>         * configure.ac: Handle NetBSD specific DEBUGDIR.
>         * configure: Regenerate.
> ---
>  gdb/ChangeLog    |  5 +++++
>  gdb/configure    | 11 ++++++++++-
>  gdb/configure.ac | 11 ++++++++++-
>  3 files changed, 25 insertions(+), 2 deletions(-)
>
> diff --git a/gdb/ChangeLog b/gdb/ChangeLog
> index 7ea85799211..af6844b6ace 100644
> --- a/gdb/ChangeLog
> +++ b/gdb/ChangeLog
> @@ -1,3 +1,8 @@
> +2020-04-08  Kamil Rytarowski  <n54@gmx.com>
> +
> +       * configure.ac: Handle NetBSD specific DEBUGDIR.
> +       * configure: Regenerate.
> +
>  2020-04-08  Simon Marchi  <simon.marchi@polymtl.ca>
>
>         * dwarf2/read.c (read_gdb_index_from_buffer): Remove objfile
> diff --git a/gdb/configure b/gdb/configure
> index afafc2c8d18..636a3f69f00 100755
> --- a/gdb/configure
> +++ b/gdb/configure
> @@ -6416,6 +6416,15 @@ if test x"$gdb_cv_have_makeinfo_click" = xyes; then
>  fi
>
>
> +case "${host}" in
> +  *-*-netbsd*)
> +    DEFAULTDEBUGDIR=/usr/libdata/debug

Wouldn't it be better to make this ${prefix}/libdata/debug?

> +    ;;
> +  *)
> +    DEFAULTDEBUGDIR=${libdir}/debug
> +    ;;
> +esac
> +
>
>
>  # Check whether --with-separate-debug-dir was given.
> @@ -6423,7 +6432,7 @@ if test "${with_separate_debug_dir+set}" = set; then :
>    withval=$with_separate_debug_dir;
>      DEBUGDIR=$withval
>  else
> -  DEBUGDIR=${libdir}/debug
> +  DEBUGDIR=${DEFAULTDEBUGDIR}
>  fi
>
>
> diff --git a/gdb/configure.ac b/gdb/configure.ac
> index b9dbe13232a..3cef95fbcb8 100644
> --- a/gdb/configure.ac
> +++ b/gdb/configure.ac
> @@ -93,9 +93,18 @@ if test x"$gdb_cv_have_makeinfo_click" = xyes; then
>  fi
>  AC_SUBST(MAKEINFO_EXTRA_FLAGS)
>
> +case "${host}" in
> +  *-*-netbsd*)
> +    DEFAULTDEBUGDIR=/usr/libdata/debug
> +    ;;
> +  *)
> +    DEFAULTDEBUGDIR=${libdir}/debug
> +    ;;
> +esac
> +
>  GDB_AC_WITH_DIR(DEBUGDIR, separate-debug-dir,
>      [look for global separate debug info in this path @<:@LIBDIR/debug@:>@],
> -    [${libdir}/debug])
> +    [${DEFAULTDEBUGDIR}])
>
>  # We can't pass paths as command line arguments.
>  # Mingw32 tries to be clever and will convert the paths for us.
> --
> 2.25.0
>