Thu May 19 15:57:23 2022 UTC ()
gcc10-aux: Fix build when lang/libunwind is installed

Do not include PREFIX/include in CPPFLAGS.


(ryoon)
diff -r1.2 -r1.3 pkgsrc/lang/gcc10-aux/Makefile
cvs diff -r1.2 -r1.3 pkgsrc/lang/gcc10-aux/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc10-aux/Makefile 2022/03/27 15:06:11 1.2
+++ pkgsrc/lang/gcc10-aux/Makefile 2022/05/19 15:57:23 1.3
@@ -1,32 +1,35 @@ @@ -1,32 +1,35 @@
1# $NetBSD: Makefile,v 1.2 2022/03/27 15:06:11 tnn Exp $ 1# $NetBSD: Makefile,v 1.3 2022/05/19 15:57:23 ryoon Exp $
2 2
3GCC_PKGNAME= gcc10-aux 3GCC_PKGNAME= gcc10-aux
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC10_DIST_VERSION} 6DISTNAME= gcc-${GCC10_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC10_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC10_DIST_VERSION}
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC10_DIST_VERSION}/} 9MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC10_DIST_VERSION}/}
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= irvise@irvise.xyz 12MAINTAINER= irvise@irvise.xyz
13HOMEPAGE= https://gcc.gnu.org/ 13HOMEPAGE= https://gcc.gnu.org/
14COMMENT= The GNU Compiler Collection (GCC) with Ada support v10 14COMMENT= The GNU Compiler Collection (GCC) with Ada support v10
15LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 15LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
16 16
17DISTFILES= ${DEFAULT_DISTFILES} 17DISTFILES= ${DEFAULT_DISTFILES}
18EXTRACT_ONLY= ${DEFAULT_DISTFILES} 18EXTRACT_ONLY= ${DEFAULT_DISTFILES}
19 19
 20# Add gcc6-aux as an explicit dependency. It is needed to bootstrap.
 21BUILD_DEPENDS+= gcc6-aux-[0-9]*:../../lang/gcc6-aux
 22
20# Relocations result in a linker error on AArch64, but not x86. 23# Relocations result in a linker error on AArch64, but not x86.
21MKPIE_SUPPORTED= no 24MKPIE_SUPPORTED= no
22 25
23CHECK_RELRO_SKIP+= ${GCC_PKGNAME}/lib/* 26CHECK_RELRO_SKIP+= ${GCC_PKGNAME}/lib/*
24 27
25NOT_FOR_PLATFORM= Interix-*-* 28NOT_FOR_PLATFORM= Interix-*-*
26 29
27USE_TOOLS+= gmake makeinfo sed:run tar:build 30USE_TOOLS+= gmake makeinfo sed:run tar:build
28USE_TOOLS.NetBSD+= gsed 31USE_TOOLS.NetBSD+= gsed
29 32
30GNU_CONFIGURE= yes 33GNU_CONFIGURE= yes
31GNU_CONFIGURE_STRICT= no 34GNU_CONFIGURE_STRICT= no
32## Build outside ${WRKSRC} 35## Build outside ${WRKSRC}
@@ -199,18 +202,16 @@ post-install: @@ -199,18 +202,16 @@ post-install:
199 202
200GENERATE_PLIST+= \ 203GENERATE_PLIST+= \
201 cd ${DESTDIR}${PREFIX} && \ 204 cd ${DESTDIR}${PREFIX} && \
202 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT}; 205 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT};
203 206
204CHECK_BUILTIN.zlib:= yes 207CHECK_BUILTIN.zlib:= yes
205.include "../../devel/zlib/builtin.mk" 208.include "../../devel/zlib/builtin.mk"
206CHECK_BUILTIN.zlib:= no 209CHECK_BUILTIN.zlib:= no
207.if !empty(USE_BUILTIN.zlib:M[yY][eE][sS]) 210.if !empty(USE_BUILTIN.zlib:M[yY][eE][sS])
208CONFIGURE_ARGS+= --with-system-zlib 211CONFIGURE_ARGS+= --with-system-zlib
209.else 212.else
210CONFIGURE_ARGS+= --without-system-zlib 213CONFIGURE_ARGS+= --without-system-zlib
211.endif 214.endif
212# Add gcc6-aux as an explicit dependency. It is needed to bootstrap. 
213.include "../../lang/gcc6-aux/buildlink3.mk" 
214.include "../../mk/dlopen.buildlink3.mk" 215.include "../../mk/dlopen.buildlink3.mk"
215.include "../../mk/pthread.buildlink3.mk" 216.include "../../mk/pthread.buildlink3.mk"
216.include "../../mk/bsd.pkg.mk" 217.include "../../mk/bsd.pkg.mk"