Module Name: pkgsrc
Committed By: tnn
Date: Sun Mar 22 17:47:56 UTC 2020
Modified Files:
pkgsrc/lang/gcc8: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/gcc8/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/gcc8/Makefile
diff -u pkgsrc/lang/gcc8/Makefile:1.14 pkgsrc/lang/gcc8/Makefile:1.15
--- pkgsrc/lang/gcc8/Makefile:1.14 Wed Mar 18 12:50:56 2020
+++ pkgsrc/lang/gcc8/Makefile Sun Mar 22 17:47:56 2020
@@ -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 @@ GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
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 @@ GENERATE_PLIST+= \
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"