Wed Aug 10 21:54:47 2022 UTC ()
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.


(jperkin)
diff -r1.44 -r1.45 pkgsrc/lang/gcc7/Makefile
diff -r1.38 -r1.39 pkgsrc/lang/gcc9/Makefile
cvs diff -r1.44 -r1.45 pkgsrc/lang/gcc7/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc7/Makefile 2022/06/28 11:34:11 1.44
+++ pkgsrc/lang/gcc7/Makefile 2022/08/10 21:54:46 1.45
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.44 2022/06/28 11:34:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.45 2022/08/10 21:54:46 jperkin Exp $
2 2
3GCC_PKGNAME= gcc7 3GCC_PKGNAME= gcc7
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC7_DIST_VERSION} 6DISTNAME= gcc-${GCC7_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC7_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC7_DIST_VERSION}
8PKGREVISION= 6 8PKGREVISION= 6
9## When bumping the PKGREVISION of this package the PKGREVISION of 9## When bumping the PKGREVISION of this package the PKGREVISION of
10## lang/gcc7-libs needs to be bumped to be at least 1 more than the 10## lang/gcc7-libs needs to be bumped to be at least 1 more than the
11## PKGREVISION of this package! 11## PKGREVISION of this package!
12CATEGORIES= lang 12CATEGORIES= lang
13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC7_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC7_DIST_VERSION}/}
14EXTRACT_SUFX= .tar.xz 14EXTRACT_SUFX= .tar.xz
@@ -150,28 +150,27 @@ MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED} @@ -150,28 +150,27 @@ MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
150. if exists(/usr/sfw/bin/gobjdump) 150. if exists(/usr/sfw/bin/gobjdump)
151CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump 151CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
152. endif 152. endif
153. if exists(/usr/bin/ld) 153. if exists(/usr/bin/ld)
154CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld 154CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld
155. else 155. else
156CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld 156CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
157. endif 157. endif
158. if exists(/usr/sfw/bin/gas) 158. if exists(/usr/sfw/bin/gas)
159CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas 159CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
160. elif exists(/usr/ccs/bin/as) 160. elif exists(/usr/ccs/bin/as)
161CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as 161CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
162. else 162. else
163BUILDLINK_DEPMETHOD.binutils= full 163DEPENDS+= binutils-[0-9]*:../../devel/binutils
164. include "../../devel/binutils/buildlink3.mk" 
165CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas 164CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas
166. endif 165. endif
167.endif 166.endif
168 167
169.if ${OS_VARIANT} == "SmartOS" 168.if ${OS_VARIANT} == "SmartOS"
170SUBST_CLASSES+= ccs 169SUBST_CLASSES+= ccs
171SUBST_STAGE.ccs= pre-configure 170SUBST_STAGE.ccs= pre-configure
172SUBST_FILES.ccs= contrib/make_sunver.pl 171SUBST_FILES.ccs= contrib/make_sunver.pl
173SUBST_SED.ccs= -e 's,/usr/ccs/bin,/usr/bin,g' 172SUBST_SED.ccs= -e 's,/usr/ccs/bin,/usr/bin,g'
174.endif 173.endif
175 174
176CTF_FILES_SKIP+= */gengtype # CPU limit exceeded 175CTF_FILES_SKIP+= */gengtype # CPU limit exceeded
177 176
cvs diff -r1.38 -r1.39 pkgsrc/lang/gcc9/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc9/Makefile 2022/06/30 11:18:32 1.38
+++ pkgsrc/lang/gcc9/Makefile 2022/08/10 21:54:47 1.39
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.38 2022/06/30 11:18:32 nia Exp $ 1# $NetBSD: Makefile,v 1.39 2022/08/10 21:54:47 jperkin Exp $
2 2
3GCC_PKGNAME= gcc9 3GCC_PKGNAME= gcc9
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC9_DIST_VERSION} 6DISTNAME= gcc-${GCC9_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC9_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC9_DIST_VERSION}
8## When bumping the PKGREVISION of this package the PKGREVISION of 8## When bumping the PKGREVISION of this package the PKGREVISION of
9## lang/gcc9-libs needs to be bumped to be at least 1 more than the 9## lang/gcc9-libs needs to be bumped to be at least 1 more than the
10## PKGREVISION of this package! 10## PKGREVISION of this package!
11PKGREVISION= 9 11PKGREVISION= 9
12CATEGORIES= lang 12CATEGORIES= lang
13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC9_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC9_VERSION}/}
14EXTRACT_SUFX= .tar.xz 14EXTRACT_SUFX= .tar.xz
@@ -154,28 +154,27 @@ MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED} @@ -154,28 +154,27 @@ MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
154. if exists(/usr/sfw/bin/gobjdump) 154. if exists(/usr/sfw/bin/gobjdump)
155CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump 155CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
156. endif 156. endif
157. if exists(/usr/bin/ld) 157. if exists(/usr/bin/ld)
158CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld 158CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld
159. else 159. else
160CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld 160CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
161. endif 161. endif
162. if exists(/usr/sfw/bin/gas) 162. if exists(/usr/sfw/bin/gas)
163CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas 163CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
164. elif exists(/usr/ccs/bin/as) 164. elif exists(/usr/ccs/bin/as)
165CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as 165CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
166. else 166. else
167BUILDLINK_DEPMETHOD.binutils= full 167DEPENDS+= binutils-[0-9]*:../../devel/binutils
168. include "../../devel/binutils/buildlink3.mk" 
169CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas 168CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas
170. endif 169. endif
171.endif 170.endif
172 171
173.if ${OS_VARIANT} == SmartOS 172.if ${OS_VARIANT} == SmartOS
174SUBST_CLASSES+= ccs 173SUBST_CLASSES+= ccs
175SUBST_STAGE.ccs= pre-configure 174SUBST_STAGE.ccs= pre-configure
176SUBST_FILES.ccs= contrib/make_sunver.pl 175SUBST_FILES.ccs= contrib/make_sunver.pl
177SUBST_SED.ccs= -e 's,/usr/ccs/bin,/usr/bin,g' 176SUBST_SED.ccs= -e 's,/usr/ccs/bin,/usr/bin,g'
178.endif 177.endif
179 178
180SUBST_CLASSES+= vars 179SUBST_CLASSES+= vars
181SUBST_MESSAGE.vars= Setting target machine name path in ${SUBST_FILES.vars} 180SUBST_MESSAGE.vars= Setting target machine name path in ${SUBST_FILES.vars}