[PATCH] 6/gdb: fix building on FreeBSD 13.1

[Joel Sherrill]

I've followed the discussion with gdb and this is ok. I still question them
installing that header file. The the patch you're adding fixes it by making
local includes ahead. But I don't remember seeing an answer to the question
of should the header file be installed anyway.

Ok to push

--joel

On Wed, Mar 8, 2023, 9:43 PM <chrisj at rtems.org> wrote:

> From: Chris Johns <chrisj at rtems.org>
>
> See https://sourceware.org/bugzilla/show_bug.cgi?id=30214
>
> Closes #4872
> ---
>  rtems/config/tools/rtems-gdb-13.1.cfg |  4 ++++
>  source-builder/sb/freebsd.py          | 14 +++++++-------
>  2 files changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/rtems/config/tools/rtems-gdb-13.1.cfg
> b/rtems/config/tools/rtems-gdb-13.1.cfg
> index 76ed22f..5766594 100644
> --- a/rtems/config/tools/rtems-gdb-13.1.cfg
> +++ b/rtems/config/tools/rtems-gdb-13.1.cfg
> @@ -10,4 +10,8 @@
>  %hash sha512 gdb-%{gdb_version}.tar.xz \
>
> 5lBU/7wDV+7tSxfh7cXvRapzyd3zsSEGUePYWVduJ8HSeyZoAP4mMo7aWIV0VczYYy9AAM/F9j+QhUCWKQGHyg==
>
> +%patch add gdb -p0 --rsb-file=gdb-13-freebsd-include.diff
> https://sourceware.org/bugzilla/attachment.cgi?id=14742
> +%hash sha512 gdb-13-freebsd-include.diff \
> +
>  2oKUpRyZIwXwyKHXn5lxXte+jV853Zvg5UHLKLfmVCW4QLrLMFsnO5LvPamIqjXnqPztB8IPEY18pdw8vOYaOw==
> +
>  %include %{_configdir}/gdb-common-1.cfg
> diff --git a/source-builder/sb/freebsd.py b/source-builder/sb/freebsd.py
> index 472f670..5d6564b 100644
> --- a/source-builder/sb/freebsd.py
> +++ b/source-builder/sb/freebsd.py
> @@ -101,22 +101,22 @@ def load():
>              cxx = '/usr/bin/clang++'
>              if check.check_exe(cxx, cxx):
>                  raise error.general('no valid c++ found')
> -        #
> -        # Assume the compiler is clang and so we need to increase
> -        # bracket depth build build the gcc ARM compiler.
> -        #
> -        defines['build_cflags'] = '-O2 -pipe -fbracket-depth=1024'
> -        defines['build_cxxflags'] = '-O2 -pipe -fbracket-depth=1024'
>          cvs = 'cvs'
>          if check.check_exe(cvs, cvs):
>              defines['__cvs'] = cvs
> +        if fb_version <= 12:
> +            #
> +            # Assume the compiler is clang and so we need to increase
> +            # bracket depth build build the gcc ARM compiler.
> +            #
> +            defines['build_cflags'] = '-O2 -pipe -fbracket-depth=1024'
> +            defines['build_cxxflags'] = '-O2 -pipe -fbracket-depth=1024'
>          #
>          # Fix the mess iconv is on FreeBSD 10.0 and higher.
>          #
>          defines['iconv_includes'] = ('none', 'none', '%{host_includes}
> %{host_ldflags}')
>          if fb_version >= 12:
>              defines['iconv_prefix'] = ('none', 'none', '%{_usr}')
> -
>          #
>          # On 11.0+ makeinfo and install-info have moved to /usr/local/...
>          #
> --
> 2.37.1
>
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/devel/attachments/20230308/82d7afa7/attachment-0001.htm>