diff options
| author | jperkin <jperkin@pkgsrc.org> | 2022-08-10 21:54:46 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2022-08-10 21:54:46 +0000 |
| commit | 4f0331503b7eae837eb79f534ef910f728329e14 (patch) | |
| tree | 20ca5e204bdda40a34e2fd6652bf8c4c0c2a1ef9 | |
| parent | 451559b201b5329ac7d447be628831ec4f177c77 (diff) | |
| download | pkgsrc-4f0331503b7eae837eb79f534ef910f728329e14.tar.gz | |
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.
| -rw-r--r-- | lang/gcc7/Makefile | 5 | ||||
| -rw-r--r-- | lang/gcc9/Makefile | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lang/gcc7/Makefile b/lang/gcc7/Makefile index 6dce4379012..bfef172dea9 100644 --- a/lang/gcc7/Makefile +++ b/lang/gcc7/Makefile @@ -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=/usr/sfw/bin/gas . 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 --git a/lang/gcc9/Makefile b/lang/gcc9/Makefile index b8fb85e7ef6..d35f64448eb 100644 --- a/lang/gcc9/Makefile +++ b/lang/gcc9/Makefile @@ -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=/usr/sfw/bin/gas . 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 |