CVS commit: pkgsrc/lang

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Aug 10 21:54:47 UTC 2022

Modified Files:
        pkgsrc/lang/gcc7: Makefile
        pkgsrc/lang/gcc9: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/lang/gcc7/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/lang/gcc9/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc7/Makefile
diff -u pkgsrc/lang/gcc7/Makefile:1.44 pkgsrc/lang/gcc7/Makefile:1.45
--- pkgsrc/lang/gcc7/Makefile:1.44      Tue Jun 28 11:34:11 2022
+++ pkgsrc/lang/gcc7/Makefile   Wed Aug 10 21:54:46 2022
@@ -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 @@ CONFIGURE_ARGS+=    --with-gnu-as --with-as
 .  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

Index: pkgsrc/lang/gcc9/Makefile
diff -u pkgsrc/lang/gcc9/Makefile:1.38 pkgsrc/lang/gcc9/Makefile:1.39
--- pkgsrc/lang/gcc9/Makefile:1.38      Thu Jun 30 11:18:32 2022
+++ pkgsrc/lang/gcc9/Makefile   Wed Aug 10 21:54:47 2022
@@ -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 @@ CONFIGURE_ARGS+=    --with-gnu-as --with-as
 .  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