CVS commit: pkgsrc/meta-pkgs/boost

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Aug 22 21:05:27 UTC 2019

Modified Files:
        pkgsrc/meta-pkgs/boost: distinfo
Added Files:
        pkgsrc/meta-pkgs/boost/patches:
            patch-boost_core_uncaught__exceptions.hpp

Log Message:
boost: fix build on NetBSD HEAD-llvm


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 pkgsrc/meta-pkgs/boost/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/meta-pkgs/boost/patches/patch-boost_core_uncaught__exceptions.hpp

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

Modified files:

Index: pkgsrc/meta-pkgs/boost/distinfo
diff -u pkgsrc/meta-pkgs/boost/distinfo:1.126 pkgsrc/meta-pkgs/boost/distinfo:1.127
--- pkgsrc/meta-pkgs/boost/distinfo:1.126       Thu Aug 22 12:17:52 2019
+++ pkgsrc/meta-pkgs/boost/distinfo     Thu Aug 22 21:05:27 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.126 2019/08/22 12:17:52 ryoon Exp $
+$NetBSD: distinfo,v 1.127 2019/08/22 21:05:27 tnn Exp $
 
 SHA1 (boost_1_71_0.tar.bz2) = 5b0a3cef23f0c124dde5bbb64324f615ac843ace
 RMD160 (boost_1_71_0.tar.bz2) = a46b886ca26993610c84615fca4340ad3f955f81
@@ -14,6 +14,7 @@ SHA1 (patch-boost_config_platform_solari
 SHA1 (patch-boost_config_stdlib_libcpp.hpp) = d57ee228c9dfa43665d261e7423fd10122dfd1a7
 SHA1 (patch-boost_config_stdlib_libstdcpp3.hpp) = 52ebedd5e80b3a8c257eccb28cd2db76cb1ca01e
 SHA1 (patch-boost_core_noncopyable.hpp) = 63a3c2fc0bc85af77ff8bc17ad3a21ef0bc398c1
+SHA1 (patch-boost_core_uncaught__exceptions.hpp) = eba82062750f4e09bcef467476e8c4abd125f7b6
 SHA1 (patch-boost_math_special__functions_expm1.hpp) = 724fbd40b3780da8af6ce10bbf50a354eb19031a
 SHA1 (patch-boost_math_special__functions_log1p.hpp) = df6fd088da736a4640663b64841383432f1a1201
 SHA1 (patch-boost_math_tools_config.hpp) = 9d7ef331414526057a6ac1a0ba1af815f017dfc3

Added files:

Index: pkgsrc/meta-pkgs/boost/patches/patch-boost_core_uncaught__exceptions.hpp
diff -u /dev/null pkgsrc/meta-pkgs/boost/patches/patch-boost_core_uncaught__exceptions.hpp:1.1
--- /dev/null   Thu Aug 22 21:05:27 2019
+++ pkgsrc/meta-pkgs/boost/patches/patch-boost_core_uncaught__exceptions.hpp    Thu Aug 22 21:05:27 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-boost_core_uncaught__exceptions.hpp,v 1.1 2019/08/22 21:05:27 tnn Exp $
+
+match prototype for __cxa_get_globals() from libc++
+
+./boost/core/uncaught_exceptions.hpp:75:30: error: exception specification in declaration does not match previous declaration
+/usr/include/c++/cxxabi.h:190:19: note: previous declaration is here
+__cxa_eh_globals *__cxa_get_globals(void);
+
+--- boost/core/uncaught_exceptions.hpp.orig    2019-08-22 20:44:08.783902992 +0000
++++ boost/core/uncaught_exceptions.hpp
+@@ -69,7 +69,7 @@
+     )
+ namespace __cxxabiv1 {
+ struct __cxa_eh_globals;
+-#if defined(__OpenBSD__)
++#if defined(__OpenBSD__) || (defined(__NetBSD__) && defined(_LIBCPP_VERSION))
+ extern "C" __cxa_eh_globals* __cxa_get_globals();
+ #else
+ extern "C" __cxa_eh_globals* __cxa_get_globals() BOOST_NOEXCEPT_OR_NOTHROW __attribute__((__const__));