Mon Mar 23 10:37:00 2020 UTC ()
gcc8: surround use of zlib/builtin.mk with CHECK_BUILTIN


(tnn)
diff -r1.15 -r1.16 pkgsrc/lang/gcc8/Makefile
cvs diff -r1.15 -r1.16 pkgsrc/lang/gcc8/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc8/Makefile 2020/03/22 17:47:56 1.15
+++ pkgsrc/lang/gcc8/Makefile 2020/03/23 10:37:00 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2020/03/22 17:47:56 tnn Exp $ 1# $NetBSD: Makefile,v 1.16 2020/03/23 10:37:00 tnn Exp $
2 2
3GCC_PKGNAME= gcc8 3GCC_PKGNAME= gcc8
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC8_DIST_VERSION} 6DISTNAME= gcc-${GCC8_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC8_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC8_DIST_VERSION}
8PKGREVISION= 2 8PKGREVISION= 2
9## When bumping the PKGREVISION of this package the PKGREVISION of 9## When bumping the PKGREVISION of this package the PKGREVISION of
10## lang/gcc8-libs needs to be bump to be at least 1 more than the 10## lang/gcc8-libs needs to be bump 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-${GCC8_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC8_DIST_VERSION}/}
14EXTRACT_SUFX= .tar.xz 14EXTRACT_SUFX= .tar.xz
@@ -189,24 +189,26 @@ post-test: @@ -189,24 +189,26 @@ post-test:
189 189
190post-install: 190post-install:
191 ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \ 191 ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \
192 ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc ) 192 ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc )
193.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11" 193.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11"
194 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE} 194 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE}
195 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE} 195 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE}
196.endif 196.endif
197 197
198GENERATE_PLIST+= \ 198GENERATE_PLIST+= \
199 cd ${DESTDIR}${PREFIX} && \ 199 cd ${DESTDIR}${PREFIX} && \
200 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ; 200 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ;
201 201
 202CHECK_BUILTIN.zlib:= yes
202.include "../../devel/zlib/builtin.mk" 203.include "../../devel/zlib/builtin.mk"
 204CHECK_BUILTIN.zlib:= no
203.if !empty(USE_BUILTIN.zlib:M[yY][eE][sS]) 205.if !empty(USE_BUILTIN.zlib:M[yY][eE][sS])
204CONFIGURE_ARGS+= --with-system-zlib 206CONFIGURE_ARGS+= --with-system-zlib
205.include "../../devel/zlib/buildlink3.mk" 207.include "../../devel/zlib/buildlink3.mk"
206.else 208.else
207CONFIGURE_ARGS+= --without-system-zlib 209CONFIGURE_ARGS+= --without-system-zlib
208.endif 210.endif
209.include "../../lang/python/application.mk" 211.include "../../lang/python/application.mk"
210.include "../../mk/dlopen.buildlink3.mk" 212.include "../../mk/dlopen.buildlink3.mk"
211.include "../../mk/pthread.buildlink3.mk" 213.include "../../mk/pthread.buildlink3.mk"
212.include "../../mk/bsd.pkg.mk" 214.include "../../mk/bsd.pkg.mk"