build: use header-only Boost unit test

2 files changed, 1 insertions, 41 deletions

diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
index 3c849b1e8d..56c5327342 100644
--- a/depends/packages/boost.mk
+++ b/depends/packages/boost.mk
@@ -4,7 +4,6 @@ $(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$($(
 $(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.bz2
 $(package)_sha256_hash=d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee
 $(package)_dependencies=native_b2
-$(package)_patches=fix_openbsd_test_lib.patch
 
 define $(package)_set_vars
 $(package)_config_opts_release=variant=release
@@ -23,7 +22,7 @@ $(package)_toolset_$(host_os)=clang
 else
 $(package)_toolset_$(host_os)=gcc
 endif
-$(package)_config_libraries=test
+$(package)_config_libraries=headers
 $(package)_cxxflags+=-std=c++17
 $(package)_cxxflags_linux=-fPIC
 $(package)_cxxflags_freebsd=-fPIC
@@ -33,7 +32,6 @@ $(package)_cxxflags_x86_64=-fcf-protection=full
 endef
 
 define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/fix_openbsd_test_lib.patch && \
   echo "using $($(package)_toolset_$(host_os)) : : $($(package)_cxx) : <cflags>\"$($(package)_cflags)\" <cxxflags>\"$($(package)_cxxflags)\" <compileflags>\"$($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$($(package)_ar)\" <striper>\"$(host_STRIP)\"  <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
 endef
 
diff --git a/depends/patches/boost/fix_openbsd_test_lib.patch b/depends/patches/boost/fix_openbsd_test_lib.patch
deleted file mode 100644
index 84351065a3..0000000000
--- a/depends/patches/boost/fix_openbsd_test_lib.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 684f067dde3b798877655cdda4eab8d7c26b2510
-Author: George Koehler <kernigh@gmail.com>
-Date:   Thu Oct 3 20:06:38 2019 -0400
-
-    OpenBSD is missing SI_ASYNCIO and SI_MESGQ
-    
-    Check if SI_ASYNCIO and SI_MESGQ are defined as macros.  This allows
-    to run tests on OpenBSD 6.5, where the macros are missing.
-    
-    This is identical to patch-boost_test_impl_execution_monitor_ipp in
-    OpenBSD Ports, except that I added a comment.
-
-    Can be removed when we use Boost 1.72.x or later.
-
-diff --git a/boost/test/impl/execution_monitor.ipp b/boost/test/impl/execution_monitor.ipp
-index ccc44972..77a01e21 100644
---- a/boost/test/impl/execution_monitor.ipp
-+++ b/boost/test/impl/execution_monitor.ipp
-@@ -391,14 +391,19 @@ system_signal_exception::report() const
-         report_error( execution_exception::system_error,
-                       "signal: the expiration of a timer set by timer_settimer()" );
-         break;
-+// OpenBSD was missing SI_ASYNCIO and SI_MESGQ
-+#ifdef SI_ASYNCIO
-     case SI_ASYNCIO:
-         report_error( execution_exception::system_error,
-                       "signal: generated by the completion of an asynchronous I/O request" );
-         break;
-+#endif
-+#ifdef SI_MESGQ
-     case SI_MESGQ:
-         report_error( execution_exception::system_error,
-                       "signal: generated by the the arrival of a message on an empty message queue" );
-         break;
-+#endif
-     default:
-         break;
-     }