CVS commit: pkgsrc/devel/boost-libs

["Min Sik Kim" <minskim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   minskim
Date:           Thu Dec 28 02:18:42 UTC 2017

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

Log Message:
devel/boost-libs: Enable stacktrace_backtrace on Debian only

This fixes the build failure on non-Debin Linux systems without
libbacktrace.

A general solution will be needed when the freeze is over.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/devel/boost-libs/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/boost-libs/PLIST.Linux

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.60 pkgsrc/devel/boost-libs/Makefile:1.61
--- pkgsrc/devel/boost-libs/Makefile:1.60       Wed Dec 20 17:28:25 2017
+++ pkgsrc/devel/boost-libs/Makefile    Thu Dec 28 02:18:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2017/12/20 17:28:25 minskim Exp $
+# $NetBSD: Makefile,v 1.61 2017/12/28 02:18:42 minskim Exp $
 
 BOOST_PACKAGE=         libs
 BOOST_COMMENT=         (binary libraries)
@@ -11,7 +11,7 @@ PKGREVISION= 3
 INSTALLATION_DIRS+=    lib
 
 BJAM_ARGS+=            --without-python
-PLIST_VARS+=           context fiber log
+PLIST_VARS+=           backtrace context fiber log
 
 .if ${OPSYS} == "NetBSD" && ((${MACHINE_ARCH} == "i386") || (!empty(MACHINE_ARCH:Mearm*) && !empty(PKGSRC_COMPILER:Mgcc)))
 BJAM_ARGS+=            pch=off
@@ -32,6 +32,13 @@ BJAM_ARGS+=          --without-log
 PLIST.log=             yes
 .endif
 
+# libboost_stacktrace_backtrace requires libbacktrace.
+# FIXME: The condition needs to be refined for non-Debian/Ubuntu
+# platforms shipped with libbacktrace.
+.if ${OPSYS} == "Linux" && exists(/etc/debian_version)
+PLIST.backtrace=       yes
+.endif
+
 # XXX boost1.64 fiber not building even on netbsd7.99 + gcc5.4
 # fiber requires context, so also disable it where context cannot be built
 # Additionally fiber checks std::timed_mutex.

Index: pkgsrc/devel/boost-libs/PLIST.Linux
diff -u pkgsrc/devel/boost-libs/PLIST.Linux:1.4 pkgsrc/devel/boost-libs/PLIST.Linux:1.5
--- pkgsrc/devel/boost-libs/PLIST.Linux:1.4     Wed Dec 20 17:28:25 2017
+++ pkgsrc/devel/boost-libs/PLIST.Linux Thu Dec 28 02:18:42 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Linux,v 1.4 2017/12/20 17:28:25 minskim Exp $
-lib/libboost_stacktrace_backtrace.a
-lib/libboost_stacktrace_backtrace.so
-lib/libboost_stacktrace_backtrace.so.${BOOST_VERSION}
+@comment $NetBSD: PLIST.Linux,v 1.5 2017/12/28 02:18:42 minskim Exp $
+${PLIST.backtrace}lib/libboost_stacktrace_backtrace.a
+${PLIST.backtrace}lib/libboost_stacktrace_backtrace.so
+${PLIST.backtrace}lib/libboost_stacktrace_backtrace.so.${BOOST_VERSION}