CVS commit: pkgsrc/devel/boost-libs

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Jan 14 20:34:11 UTC 2020

Modified Files:
        pkgsrc/devel/boost-libs: Makefile

Log Message:
boost-libs: Fix build failure on NetBSD/amd64 8 and lang/gcc7

* PCH option generates errors on NetBSD/amd64 8 and lang/gcc7 environment.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/devel/boost-libs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/boost-libs/Makefile
diff -u pkgsrc/devel/boost-libs/Makefile:1.78 pkgsrc/devel/boost-libs/Makefile:1.79
--- pkgsrc/devel/boost-libs/Makefile:1.78       Tue Dec 31 13:30:27 2019
+++ pkgsrc/devel/boost-libs/Makefile    Tue Jan 14 20:34:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2019/12/31 13:30:27 nros Exp $
+# $NetBSD: Makefile,v 1.79 2020/01/14 20:34:11 ryoon Exp $
 
 BOOST_PACKAGE=         libs
 BOOST_COMMENT=         (binary libraries)
@@ -12,7 +12,13 @@ INSTALLATION_DIRS+=  lib
 BJAM_ARGS+=            --without-python
 PLIST_VARS+=           backtrace context fiber log longdbl
 
-.if ${OPSYS} == "NetBSD" && ((${MACHINE_ARCH} == "i386") || (!empty(MACHINE_ARCH:Mearm*) && !empty(PKGSRC_COMPILER:Mgcc)))
+.include "../../mk/compiler.mk"
+
+.if (${OPSYS} == "NetBSD" && \
+       ((${MACHINE_ARCH} == "i386") || \
+       (!empty(MACHINE_ARCH:Mearm*) && !empty(PKGSRC_COMPILER:Mgcc)))) || \
+    (!empty(MACHINE_PLATFORM:MNetBSD-8.*-x86_64) && \
+       !empty(CC_VERSION:Mgcc-7.*))
 BJAM_ARGS+=            pch=off
 .endif