Re: HEAD tools build broken on amd64

[Paul Goyette <paul%whooppee.com@localhost>]

I can confirm that this fixes my problem!  Please commit!


On Mon, 7 Sep 2020, Tom Spindler (moof) wrote:

> > > > > > /build/netbsd-compat/src_ro/tools/binutils/../../external/gpl3/binutils/dist/bfd/netbsd.h:54:10:
> > > > > > fatal error: bfd.h: No such file or directory
> > > > > >   #include "bfd.h"
> > > > > >            ^~~~~~~
>
> Try this; it's cargo-culted cut-n-paste, so I'm not convinced it's
> correct - but `build.sh tools` succeeds for both -j1 and -j6, and the
> problem doesn't occur in trees with sources prior to the recreation of
> i386netbsd.c on 2020-aug-08.
>
>
> cvs diff: Diffing external/gpl3/binutils/dist/bfd
> Index: external/gpl3/binutils/dist/bfd/Makefile.am
> ===================================================================
> RCS file: /cvsroot/src/external/gpl3/binutils/dist/bfd/Makefile.am,v
> retrieving revision 1.7
> diff -u -w -p -r1.7 Makefile.am
> --- external/gpl3/binutils/dist/bfd/Makefile.am	3 Apr 2020 23:48:45 -0000	1.7
> +++ external/gpl3/binutils/dist/bfd/Makefile.am	7 Sep 2020 07:46:11 -0000
> @@ -363,6 +363,7 @@ BFD32_BACKENDS = \
> 	i386bsd.lo \
> 	i386lynx.lo \
> 	i386msdos.lo \
> +	i386netbsd.lo \
> 	mach-o.lo \
> 	mach-o-i386.lo \
> 	mach-o-arm.lo \
> @@ -499,6 +500,7 @@ BFD32_BACKENDS_CFILES = \
> 	i386bsd.c \
> 	i386lynx.c \
> 	i386msdos.c \
> +	i386netbsd.c \
> 	mach-o.c \
> 	mach-o-i386.c \
> 	mach-o-arm.c \
> Index: external/gpl3/binutils/dist/bfd/Makefile.in
> ===================================================================
> RCS file: /cvsroot/src/external/gpl3/binutils/dist/bfd/Makefile.in,v
> retrieving revision 1.8
> diff -u -w -p -r1.8 Makefile.in
> --- external/gpl3/binutils/dist/bfd/Makefile.in	3 Apr 2020 23:48:45 -0000	1.8
> +++ external/gpl3/binutils/dist/bfd/Makefile.in	7 Sep 2020 07:46:12 -0000
> @@ -792,6 +792,7 @@ BFD32_BACKENDS = \
> 	i386bsd.lo \
> 	i386lynx.lo \
> 	i386msdos.lo \
> +	i386netbsd.lo \
> 	mach-o.lo \
> 	mach-o-i386.lo \
> 	mach-o-arm.lo \
> @@ -930,6 +931,7 @@ BFD32_BACKENDS_CFILES = \
> 	i386bsd.c \
> 	i386lynx.c \
> 	i386msdos.c \
> +	i386netbsd.c \
> 	mach-o.c \
> 	mach-o-i386.c \
> 	mach-o-arm.c \
> @@ -1537,6 +1539,7 @@ distclean-compile:
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386bsd.Plo@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386lynx.Plo@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386msdos.Plo@am__quote@
> +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386netbsd.Plo@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ihex.Plo@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/irix-core.Plo@am__quote@
> cvs diff: Diffing external/gpl3/binutils/dist/bfd/doc
> cvs diff: Diffing external/gpl3/binutils/dist/bfd/hosts
> cvs diff: Diffing external/gpl3/binutils/dist/bfd/po
>
> !DSPAM:5f55e7cb237471722618051!

+--------------------+--------------------------+-----------------------+
| Paul Goyette       | PGP Key fingerprint:     | E-mail addresses:     |
| (Retired)          | FA29 0E3B 35AF E8AE 6651 | paul%whooppee.com@localhost     |
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoyette%netbsd.org@localhost   |
+--------------------+--------------------------+-----------------------+