[pkgsrc/trunk]: pkgsrc/lang/gcc8 gcc8: only use the system zlib if it is real...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0e763b2a332a
branches:  trunk
changeset: 413816:0e763b2a332a
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Mar 22 17:47:56 2020 +0000

description:
gcc8: only use the system zlib if it is really the system's and not pkgsrc

GCC doesn't provide any flags for linking with zlib in non-standard
locations. Also, doing so could plausibly lead to cyclic dependencies.

diffstat:

 lang/gcc8/Makefile |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 5d4118a7900d -r 0e763b2a332a lang/gcc8/Makefile
--- a/lang/gcc8/Makefile        Sun Mar 22 17:43:26 2020 +0000
+++ b/lang/gcc8/Makefile        Sun Mar 22 17:47:56 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/03/18 12:50:56 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2020/03/22 17:47:56 tnn Exp $
 
 GCC_PKGNAME=           gcc8
 .include               "version.mk"
@@ -38,7 +38,6 @@
 GNU_CONFIGURE_PREFIX=  ${GCC_PREFIX}
 INFO_FILES=            yes
 CONFIGURE_ARGS+=       --disable-libstdcxx-pch
-CONFIGURE_ARGS+=       --with-system-zlib
 CHECK_PORTABILITY_SKIP+=contrib/*
 
 UNLIMIT_RESOURCES+=    datasize
@@ -200,7 +199,13 @@
        cd ${DESTDIR}${PREFIX} &&                                       \
        ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ;
 
+.include "../../devel/zlib/builtin.mk"
+.if !empty(USE_BUILTIN.zlib:M[yY][eE][sS])
+CONFIGURE_ARGS+=       --with-system-zlib
 .include "../../devel/zlib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-system-zlib
+.endif
 .include "../../lang/python/application.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"