CVS commit: pkgsrc/devel/boost-libs

["Julian Coleman" <jdc%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jdc
Date:           Sun Nov 27 13:49:14 UTC 2016

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

Log Message:
Disable the context library (and all libraries requiring it) for alpha, m68k,
and sparc64.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/devel/boost-libs/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/boost-libs/PLIST

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.46 pkgsrc/devel/boost-libs/Makefile:1.47
--- pkgsrc/devel/boost-libs/Makefile:1.46       Fri Nov  4 13:45:31 2016
+++ pkgsrc/devel/boost-libs/Makefile    Sun Nov 27 13:49:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2016/11/04 13:45:31 maya Exp $
+# $NetBSD: Makefile,v 1.47 2016/11/27 13:49:14 jdc Exp $
 
 BOOST_PACKAGE=         libs
 BOOST_COMMENT=         (binary libraries)
@@ -12,13 +12,15 @@ INSTALLATION_DIRS+= lib
 BJAM_ARGS+=            --without-python
 PLIST_VARS+=           context fiber log long_double_math
 
-.if ${OPSYS} == "NetBSD" && ((${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc64") || (!empty(MACHINE_ARCH:Mearm*) && !empty(PKGSRC_COMPILER:Mgcc)))
+.if ${OPSYS} == "NetBSD" && ((${MACHINE_ARCH} == "i386") || (!empty(MACHINE_ARCH:Mearm*) && !empty(PKGSRC_COMPILER:Mgcc)))
 BJAM_ARGS+=            pch=off
-.elif !empty(MACHINE_ARCH:Malpha) || !empty(MACHINE_ARCH:Mm68k)
-BJAM_ARGS+=            --without-context
 .endif
 
-.if empty(BJAM_ARGS:M--without-context)
+.if !empty(MACHINE_ARCH:Malpha) || !empty(MACHINE_ARCH:Mm68k) || !empty(MACHINE_ARCH:Msparc64)
+BJAM_ARGS+=            --without-context
+BJAM_ARGS+=            --without-coroutine
+BJAM_ARGS+=            --without-coroutine2
+.else
 PLIST.context=         yes
 .endif
 
@@ -32,8 +34,10 @@ PLIST.log=           yes
 # fiber requires thread_local support, unavailable in older compilers
 # (old darwin, netbsd <6). if fiber becomes necessary, set GCC_REQD
 # on other boost-* packages, too.
+# fiber requires context, so also disable it where context cannot be built
 .if ((${OPSYS} == "Darwin" && ${OS_VERSION:R} < 14) || \
-    !empty(MACHINE_PLATFORM:MNetBSD-[0-6]*-*))
+    !empty(MACHINE_PLATFORM:MNetBSD-[0-6]*-*)) || \
+    !empty(MACHINE_ARCH:Malpha) || !empty(MACHINE_ARCH:Mm68k) || !empty(MACHINE_ARCH:Msparc64)
 BJAM_ARGS+=            --without-fiber
 .else
 PLIST.fiber=           yes

Index: pkgsrc/devel/boost-libs/PLIST
diff -u pkgsrc/devel/boost-libs/PLIST:1.30 pkgsrc/devel/boost-libs/PLIST:1.31
--- pkgsrc/devel/boost-libs/PLIST:1.30  Tue Nov  1 12:34:48 2016
+++ pkgsrc/devel/boost-libs/PLIST       Sun Nov 27 13:49:14 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2016/11/01 12:34:48 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.31 2016/11/27 13:49:14 jdc Exp $
 lib/libboost_atomic.a
 lib/libboost_atomic.so
 lib/libboost_atomic.so.${BOOST_VERSION}
@@ -11,9 +11,9 @@ ${PLIST.context}lib/libboost_context.so.
 lib/libboost_container.a
 lib/libboost_container.so
 lib/libboost_container.so.${BOOST_VERSION}
-lib/libboost_coroutine.a
-lib/libboost_coroutine.so
-lib/libboost_coroutine.so.${BOOST_VERSION}
+${PLIST.context}lib/libboost_coroutine.a
+${PLIST.context}lib/libboost_coroutine.so
+${PLIST.context}lib/libboost_coroutine.so.${BOOST_VERSION}
 lib/libboost_date_time.a
 lib/libboost_date_time.so
 lib/libboost_date_time.so.${BOOST_VERSION}