From cfbc22ab588c7ba6022d814d1128a700c4d16e6f Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 1 Oct 2021 22:02:52 +0200 Subject: [PATCH] boost: ostracize boost_system --- recipes/boost/all/conandata.yml | 66 +++++++++++++++++++ .../all/patches/1.69.0-chrono-no-system.patch | 21 ++++++ .../patches/1.69.0-contract-no-system.patch | 11 ++++ .../patches/1.69.0-coroutine-no-system.patch | 21 ++++++ .../patches/1.69.0-filesystem-no-system.patch | 21 ++++++ .../all/patches/1.69.0-locale-no-system.patch | 12 ++++ .../all/patches/1.69.0-log-no-system.patch | 12 ++++ .../all/patches/1.69.0-random-no-system.patch | 11 ++++ .../all/patches/1.69.0-thread-no-system.patch | 21 ++++++ .../all/patches/1.69.0-timer-no-system.patch | 12 ++++ .../1.69.0-type_erasure-no-system.patch | 9 +++ .../1.77.0-type_erasure-no-system.patch | 11 ++++ 12 files changed, 228 insertions(+) create mode 100644 recipes/boost/all/patches/1.69.0-chrono-no-system.patch create mode 100644 recipes/boost/all/patches/1.69.0-contract-no-system.patch create mode 100644 recipes/boost/all/patches/1.69.0-coroutine-no-system.patch create mode 100644 recipes/boost/all/patches/1.69.0-filesystem-no-system.patch create mode 100644 recipes/boost/all/patches/1.69.0-locale-no-system.patch create mode 100644 recipes/boost/all/patches/1.69.0-log-no-system.patch create mode 100644 recipes/boost/all/patches/1.69.0-random-no-system.patch create mode 100644 recipes/boost/all/patches/1.69.0-thread-no-system.patch create mode 100644 recipes/boost/all/patches/1.69.0-timer-no-system.patch create mode 100644 recipes/boost/all/patches/1.69.0-type_erasure-no-system.patch create mode 100644 recipes/boost/all/patches/1.77.0-type_erasure-no-system.patch diff --git a/recipes/boost/all/conandata.yml b/recipes/boost/all/conandata.yml index 552c7d28b57d6..56a6b4d2b7276 100644 --- a/recipes/boost/all/conandata.yml +++ b/recipes/boost/all/conandata.yml @@ -66,6 +66,26 @@ patches: base_path: "source_subfolder" - patch_file: "patches/boost_mpi_check.patch" base_path: "source_subfolder" + - patch_file: "patches/1.69.0-chrono-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-contract-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-coroutine-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-filesystem-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-locale-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-log-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-random-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-thread-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-timer-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-type_erasure-no-system.patch" + base_path: "source_subfolder" 1.70.0: - patch_file: "patches/0001-beast-fix-moved-from-executor.patch" base_path: "source_subfolder" @@ -83,6 +103,14 @@ patches: base_path: "source_subfolder" - patch_file: "patches/boost_mpi_check.patch" base_path: "source_subfolder" + - patch_file: "patches/1.69.0-contract-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-locale-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-random-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-type_erasure-no-system.patch" + base_path: "source_subfolder" 1.71.0: - patch_file: "patches/bcp_namespace_issues_1_71.patch" base_path: "source_subfolder" @@ -98,6 +126,14 @@ patches: base_path: "source_subfolder" - patch_file: "patches/boost_mpi_check.patch" base_path: "source_subfolder" + - patch_file: "patches/1.69.0-contract-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-locale-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-random-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-type_erasure-no-system.patch" + base_path: "source_subfolder" 1.72.0: - patch_file: "patches/bcp_namespace_issues_1_72.patch" base_path: "source_subfolder" @@ -117,6 +153,12 @@ patches: base_path: "source_subfolder" - patch_file: "patches/boost_mpi_check.patch" base_path: "source_subfolder" + - patch_file: "patches/1.69.0-locale-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-random-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-type_erasure-no-system.patch" + base_path: "source_subfolder" 1.73.0: - patch_file: "patches/boost_build_qcc_fix_debug_build_parameter.patch" base_path: "source_subfolder" @@ -126,6 +168,12 @@ patches: base_path: "source_subfolder" - patch_file: "patches/boost_mpi_check.patch" base_path: "source_subfolder" + - patch_file: "patches/1.69.0-locale-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-random-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-type_erasure-no-system.patch" + base_path: "source_subfolder" 1.74.0: - patch_file: "patches/boost_build_qcc_fix_debug_build_parameter_since_1_74.patch" base_path: "source_subfolder" @@ -135,6 +183,12 @@ patches: base_path: "source_subfolder" - patch_file: "patches/boost_mpi_check.patch" base_path: "source_subfolder" + - patch_file: "patches/1.69.0-locale-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-random-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.69.0-type_erasure-no-system.patch" + base_path: "source_subfolder" 1.75.0: - patch_file: "patches/boost_build_qcc_fix_debug_build_parameter_since_1_74.patch" base_path: "source_subfolder" @@ -144,13 +198,25 @@ patches: base_path: "source_subfolder" - patch_file: "patches/boost_mpi_check.patch" base_path: "source_subfolder" + - patch_file: "patches/1.69.0-locale-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.77.0-type_erasure-no-system.patch" + base_path: "source_subfolder" 1.76.0: - patch_file: "patches/boost_locale_fail_on_missing_backend.patch" base_path: "source_subfolder" - patch_file: "patches/boost_mpi_check.patch" base_path: "source_subfolder" + - patch_file: "patches/1.69.0-locale-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.77.0-type_erasure-no-system.patch" + base_path: "source_subfolder" 1.77.0: - patch_file: "patches/boost_locale_fail_on_missing_backend.patch" base_path: "source_subfolder" - patch_file: "patches/boost_1_77_mpi_check.patch" base_path: "source_subfolder" + - patch_file: "patches/1.69.0-locale-no-system.patch" + base_path: "source_subfolder" + - patch_file: "patches/1.77.0-type_erasure-no-system.patch" + base_path: "source_subfolder" diff --git a/recipes/boost/all/patches/1.69.0-chrono-no-system.patch b/recipes/boost/all/patches/1.69.0-chrono-no-system.patch new file mode 100644 index 0000000000000..71b08af4bd0c6 --- /dev/null +++ b/recipes/boost/all/patches/1.69.0-chrono-no-system.patch @@ -0,0 +1,21 @@ +This library links to boost_system, even though that library is header-only. +--- libs/chrono/build/Jamfile.v2 ++++ libs/chrono/build/Jamfile.v2 +@@ -15,7 +15,7 @@ + linux:"-lrt -lpthread" + pgi:"-lrt" + #single:BOOST_CHRONO_THREAD_DISABLED +- /boost/system//boost_system ++ + #BOOST_ERROR_CODE_HEADER_ONLY + #BOOST_SYSTEM_INLINED + #BOOST_COMMON_TYPE_USES_STATIC_ASSERT +@@ -80,7 +80,7 @@ + + : usage-requirements # pass these requirement to dependents (i.e. users) + single:BOOST_CHRONO_THREAD_DISABLED +- /boost/system//boost_system ++ + #BOOST_ERROR_CODE_HEADER_ONLY + #BOOST_SYSTEM_INLINED + #BOOST_COMMON_TYPE_USES_STATIC_ASSERT diff --git a/recipes/boost/all/patches/1.69.0-contract-no-system.patch b/recipes/boost/all/patches/1.69.0-contract-no-system.patch new file mode 100644 index 0000000000000..d98fe7b2f7e3e --- /dev/null +++ b/recipes/boost/all/patches/1.69.0-contract-no-system.patch @@ -0,0 +1,11 @@ +This library links to boost_system, even though that library is header-only. +--- libs/contract/build/Jamfile.v2 ++++ libs/contract/build/Jamfile.v2 +@@ -18,5 +18,5 @@ + ; + + # If lib as header-only, none of following will be used. +-lib boost_contract : contract.cpp : shared /boost//system ; +-lib boost_contract : contract.cpp : static /boost//system ; ++lib boost_contract : contract.cpp : shared ; ++lib boost_contract : contract.cpp : static ; diff --git a/recipes/boost/all/patches/1.69.0-coroutine-no-system.patch b/recipes/boost/all/patches/1.69.0-coroutine-no-system.patch new file mode 100644 index 0000000000000..9541d43fd6dff --- /dev/null +++ b/recipes/boost/all/patches/1.69.0-coroutine-no-system.patch @@ -0,0 +1,21 @@ +This library links to boost_system, even though that library is header-only. +--- libs/coroutine/build/Jamfile.v2 ++++ libs/coroutine/build/Jamfile.v2 +@@ -11,7 +11,7 @@ + project boost/coroutine + : requirements + /boost/context//boost_context +- /boost/system//boost_system ++ + /boost/thread//boost_thread + gcc,on:-fsplit-stack + gcc,on:-DBOOST_USE_SEGMENTED_STACKS +@@ -40,7 +40,7 @@ + exceptions.cpp + stack_traits_sources + : shared:../../context/build//boost_context +- shared:../../system/build//boost_system ++ + shared:../../thread/build//boost_thread + ; + diff --git a/recipes/boost/all/patches/1.69.0-filesystem-no-system.patch b/recipes/boost/all/patches/1.69.0-filesystem-no-system.patch new file mode 100644 index 0000000000000..f93caa10a3f14 --- /dev/null +++ b/recipes/boost/all/patches/1.69.0-filesystem-no-system.patch @@ -0,0 +1,21 @@ +This library links to boost_system, even though that library is header-only. +--- libs/filesystem/build/Jamfile.v2 ++++ libs/filesystem/build/Jamfile.v2 +@@ -26,7 +26,7 @@ + ; + + lib boost_filesystem +- : $(SOURCES).cpp ../../system/build//boost_system ++ : $(SOURCES).cpp + : shared:BOOST_FILESYSTEM_DYN_LINK=1 + static:BOOST_FILESYSTEM_STATIC_LINK=1 + : +@@ -36,7 +36,7 @@ + # means those clients have to be directly linked to Boost.System. For static + # linking this happens anyway, but for shared we need to make it happen. Since + # doing so is harmless even when not needed, we do it for all platforms. +- shared:../../system/build//boost_system ++ + ; + + boost-install boost_filesystem ; diff --git a/recipes/boost/all/patches/1.69.0-locale-no-system.patch b/recipes/boost/all/patches/1.69.0-locale-no-system.patch new file mode 100644 index 0000000000000..34aa635cdef11 --- /dev/null +++ b/recipes/boost/all/patches/1.69.0-locale-no-system.patch @@ -0,0 +1,12 @@ +This library links to boost_system, even though that library is header-only. +--- libs/locale/build/Jamfile.v2 ++++ libs/locale/build/Jamfile.v2 +@@ -403,7 +403,7 @@ + result += util/gregorian.cpp ; + } + +- result += ../../system/build//boost_system ; ++ + + + if "$(flags-only)" = "flags" diff --git a/recipes/boost/all/patches/1.69.0-log-no-system.patch b/recipes/boost/all/patches/1.69.0-log-no-system.patch new file mode 100644 index 0000000000000..b0ba4beedda07 --- /dev/null +++ b/recipes/boost/all/patches/1.69.0-log-no-system.patch @@ -0,0 +1,12 @@ +This library links to boost_system, even though that library is header-only. +--- libs/log/build/Jamfile.v2 ++++ libs/log/build/Jamfile.v2 +@@ -215,7 +215,7 @@ + + /boost/date_time//boost_date_time + /boost/filesystem//boost_filesystem +- /boost/system//boost_system ++ + single:BOOST_LOG_NO_THREADS + multi:/boost/atomic//boost_atomic + multi:/boost/thread//boost_thread diff --git a/recipes/boost/all/patches/1.69.0-random-no-system.patch b/recipes/boost/all/patches/1.69.0-random-no-system.patch new file mode 100644 index 0000000000000..ad03e39931654 --- /dev/null +++ b/recipes/boost/all/patches/1.69.0-random-no-system.patch @@ -0,0 +1,11 @@ +This library links to boost_system, even though that library is header-only. +--- libs/random/build/Jamfile.v2 ++++ libs/random/build/Jamfile.v2 +@@ -13,6 +13,6 @@ + : usage-requirements shared:BOOST_RANDOM_DYN_LINK + ; + +-lib boost_random : [ glob *.cpp ] /boost//system ; ++lib boost_random : [ glob *.cpp ] ; + + boost-install boost_random ; diff --git a/recipes/boost/all/patches/1.69.0-thread-no-system.patch b/recipes/boost/all/patches/1.69.0-thread-no-system.patch new file mode 100644 index 0000000000000..e51923c3978e9 --- /dev/null +++ b/recipes/boost/all/patches/1.69.0-thread-no-system.patch @@ -0,0 +1,21 @@ +This library links to boost_system, even though that library is header-only. +--- libs/thread/build/Jamfile.v2 ++++ libs/thread/build/Jamfile.v2 +@@ -54,7 +54,7 @@ + #BOOST_SYSTEM_NO_DEPRECATED + #BOOST_THREAD_DONT_PROVIDE_INTERRUPTIONS + +- /boost/system//boost_system ++ + #-pedantic -ansi -std=gnu++0x -Wextra -fpermissive + all + gcc:-Wextra +@@ -140,7 +140,7 @@ + #BOOST_THREAD_THROW_IF_PRECONDITION_NOT_SATISFIED + #BOOST_SYSTEM_NO_DEPRECATED + #BOOST_THREAD_DONT_PROVIDE_INTERRUPTIONS +- /boost/system//boost_system ++ + ; + + rule tag ( name : type ? : property-set ) diff --git a/recipes/boost/all/patches/1.69.0-timer-no-system.patch b/recipes/boost/all/patches/1.69.0-timer-no-system.patch new file mode 100644 index 0000000000000..251311b48c916 --- /dev/null +++ b/recipes/boost/all/patches/1.69.0-timer-no-system.patch @@ -0,0 +1,12 @@ +This library links to boost_system, even though that library is header-only. +--- libs/timer/build/Jamfile.v2 ++++ libs/timer/build/Jamfile.v2 +@@ -11,7 +11,7 @@ + : source-location ../src + : requirements + /boost/chrono//boost_chrono +- /boost/system//boost_system ++ + : usage-requirements # pass these requirement to dependants (i.e. users) + shared:BOOST_TIMER_DYN_LINK=1 + static:BOOST_TIMER_STATIC_LINK=1 diff --git a/recipes/boost/all/patches/1.69.0-type_erasure-no-system.patch b/recipes/boost/all/patches/1.69.0-type_erasure-no-system.patch new file mode 100644 index 0000000000000..c3b7cde662175 --- /dev/null +++ b/recipes/boost/all/patches/1.69.0-type_erasure-no-system.patch @@ -0,0 +1,9 @@ +This library links to boost_system, even though that library is header-only. +--- libs/type_erasure/build/Jamfile.v2 ++++ libs/type_erasure/build/Jamfile.v2 +@@ -12,4 +12,4 @@ + : usage-requirements shared:BOOST_TYPE_ERASURE_DYN_LINK + ; + +-lib boost_type_erasure : dynamic_binding.cpp /boost//thread /boost//system ; ++lib boost_type_erasure : dynamic_binding.cpp /boost//thread ; diff --git a/recipes/boost/all/patches/1.77.0-type_erasure-no-system.patch b/recipes/boost/all/patches/1.77.0-type_erasure-no-system.patch new file mode 100644 index 0000000000000..71aac779a339f --- /dev/null +++ b/recipes/boost/all/patches/1.77.0-type_erasure-no-system.patch @@ -0,0 +1,11 @@ +This library links to boost_system, even though that library is header-only. +--- libs/type_erasure/build/Jamfile.v2 ++++ libs/type_erasure/build/Jamfile.v2 +@@ -12,6 +12,6 @@ + : usage-requirements shared:BOOST_TYPE_ERASURE_DYN_LINK + ; + +-lib boost_type_erasure : dynamic_binding.cpp /boost//thread /boost//system ; ++lib boost_type_erasure : dynamic_binding.cpp /boost//thread ; + + boost-install boost_type_erasure ;