[pkgsrc/trunk]: pkgsrc/lang gcc: Switch binutils to DEPENDS instead of bl3.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/720f77df4620
branches:  trunk
changeset: 383024:720f77df4620
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Aug 10 21:54:46 2022 +0000

description:
gcc: Switch binutils to DEPENDS instead of bl3.

Both gcc and binutils ship an ansidecl.h.  Until now this hasn't been a
problem, but the recent binutils 2.39 update ships an ansidecl.h that removes
things like "PTR" which GCC depends on, and it seems as though the binutils
version is being chosen ahead of the in-tree GCC version so the build breaks.

Avoiding buildink3 ensures the headers aren't visible, and the builds are
now progressing further.

diffstat:

 lang/gcc7/Makefile |  5 ++---
 lang/gcc9/Makefile |  5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 97d88fcadac7 -r 720f77df4620 lang/gcc7/Makefile
--- a/lang/gcc7/Makefile        Wed Aug 10 21:48:47 2022 +0000
+++ b/lang/gcc7/Makefile        Wed Aug 10 21:54:46 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2022/06/28 11:34:11 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2022/08/10 21:54:46 jperkin Exp $
 
 GCC_PKGNAME=           gcc7
 .include               "version.mk"
@@ -160,8 +160,7 @@
 .  elif exists(/usr/ccs/bin/as)
 CONFIGURE_ARGS+=       --without-gnu-as --with-as=/usr/ccs/bin/as
 .  else
-BUILDLINK_DEPMETHOD.binutils=  full
-.    include "../../devel/binutils/buildlink3.mk"
+DEPENDS+=              binutils-[0-9]*:../../devel/binutils
 CONFIGURE_ARGS+=       --with-gnu-as --with-as=${PREFIX}/bin/gas
 .  endif
 .endif
diff -r 97d88fcadac7 -r 720f77df4620 lang/gcc9/Makefile
--- a/lang/gcc9/Makefile        Wed Aug 10 21:48:47 2022 +0000
+++ b/lang/gcc9/Makefile        Wed Aug 10 21:54:46 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2022/06/30 11:18:32 nia Exp $
+# $NetBSD: Makefile,v 1.39 2022/08/10 21:54:47 jperkin Exp $
 
 GCC_PKGNAME=   gcc9
 .include "version.mk"
@@ -164,8 +164,7 @@
 .  elif exists(/usr/ccs/bin/as)
 CONFIGURE_ARGS+=       --without-gnu-as --with-as=/usr/ccs/bin/as
 .  else
-BUILDLINK_DEPMETHOD.binutils=  full
-.    include "../../devel/binutils/buildlink3.mk"
+DEPENDS+=              binutils-[0-9]*:../../devel/binutils
 CONFIGURE_ARGS+=       --with-gnu-as --with-as=${PREFIX}/bin/gas
 .  endif
 .endif