From 2de293b13fc2ec73d80b6dd978fd846bd72d90e1 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Tue, 18 May 2021 20:51:03 +0100 Subject: [PATCH] Remove unneeded library dependencies from Jamfiles. --- reporting/accuracy/Jamfile.v2 | 12 ++++----- test/Jamfile.v2 | 50 +++++++++++++++++------------------ tools/Jamfile.v2 | 2 +- 3 files changed, 31 insertions(+), 33 deletions(-) diff --git a/reporting/accuracy/Jamfile.v2 b/reporting/accuracy/Jamfile.v2 index 11979c81d..a07e60083 100644 --- a/reporting/accuracy/Jamfile.v2 +++ b/reporting/accuracy/Jamfile.v2 @@ -80,42 +80,42 @@ rule all-tests { local result ; for local source in [ glob test*.cpp ] { - result += [ run $(source) /boost/regex//boost_regex /boost/system /boost/filesystem /boost/test//boost_unit_test_framework + result += [ run $(source) /boost/system /boost/filesystem /boost/test//boost_unit_test_framework : : : [ check-target-builds has_gsl : ALWAYS_TEST_DOUBLE : ] linux:-lpthread linux:-lrt gcc:$(OTHERFLAGS) ] ; - result += [ run $(source) /boost/regex//boost_regex /boost/system /boost/filesystem /boost/test//boost_unit_test_framework + result += [ run $(source) /boost/system /boost/filesystem /boost/test//boost_unit_test_framework : : : [ check-target-builds has_cxx17_cmath : TEST_CXX17_CMATH : no ] linux:-lpthread linux:-lrt gcc:$(OTHERFLAGS) : $(source:B)_cxx17_cmath ] ; - result += [ run $(source) /boost/regex//boost_regex /boost/system /boost/filesystem /boost/test//boost_unit_test_framework + result += [ run $(source) /boost/system /boost/filesystem /boost/test//boost_unit_test_framework : : : [ check-target-builds has_c99_cmath : TEST_C99 : no ] linux:-lpthread linux:-lrt gcc:$(OTHERFLAGS) : $(source:B)_c99 ] ; - result += [ run $(source) /boost/regex//boost_regex /boost/system /boost/filesystem /boost/test//boost_unit_test_framework gsl gslcblas + result += [ run $(source) /boost/system /boost/filesystem /boost/test//boost_unit_test_framework gsl gslcblas : : : [ check-target-builds has_gsl : TEST_GSL : no ] linux:-lpthread linux:-lrt gcc:$(OTHERFLAGS) : $(source:B)_gsl ] ; - result += [ run $(source) /boost/regex//boost_regex /boost/system /boost/filesystem /boost/test//boost_unit_test_framework Rmath + result += [ run $(source) /boost/system /boost/filesystem /boost/test//boost_unit_test_framework Rmath : : : [ check-target-builds has_rmath : TEST_RMATH : no ] linux:-lpthread linux:-lrt gcc:$(OTHERFLAGS) : $(source:B)_rmath ] ; - result += [ run $(source) /boost/regex//boost_regex /boost/system /boost/filesystem /boost/test//boost_unit_test_framework cephes_double + result += [ run $(source) /boost/system /boost/filesystem /boost/test//boost_unit_test_framework cephes_double : : : [ check-target-builds $(here)/third_party/cephes_double/acosh.c : TEST_CEPHES cephes_double : no ] linux:-lpthread linux:-lrt diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index fb13cb9f2..f3a3c2501 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -59,7 +59,6 @@ project # msvc:/wd4506 has no effect? # suppress xstring(237) : warning C4506: no definition for inline function ../../.. - ../../regex/build//boost_regex off:no_eh shared:BOOST_REGEX_DYN_LINK=1 # For simplicities sake, make everything a static lib: @@ -1297,99 +1296,99 @@ test-suite quadrature : [ run adaptive_gauss_kronrod_quadrature_test.cpp : : : TEST3 [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : -lquadmath ] [ requires cxx11_auto_declarations cxx11_lambdas cxx11_smart_ptr cxx11_unified_initialization_syntax ] off msvc:/bigobj release [ check-target-builds ../config//is_ci_sanitizer_run "Sanitizer CI run" : no ] : adaptive_gauss_quadrature_test_3 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=1 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_1 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=2 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_2 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=3 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_3 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=4 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_4 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=5 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_5 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=6 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_6 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=7 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_7 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=8 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_8 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=9 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_9 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=10 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_10 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=11 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_11 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=12 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_12 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=13 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_13 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=14 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_14 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=15 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_15 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=16 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_16 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=17 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_17 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=18 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_18 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=19 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_19 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=20 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_20 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=21 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_21 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=22 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_22 ] - [ run naive_monte_carlo_test.cpp ../../atomic/build//boost_atomic : : : + [ run naive_monte_carlo_test.cpp : : : msvc:/bigobj TEST=23 [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" : naive_monte_carlo_test_23 ] - [ compile compile_test/quad_naive_monte_carlo_incl_test.cpp ../../atomic/build//boost_atomic : + [ compile compile_test/quad_naive_monte_carlo_incl_test.cpp : [ requires cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_thread cxx11_hdr_atomic cxx11_decltype cxx11_hdr_future cxx11_hdr_chrono cxx11_hdr_random cxx11_allocator ] linux:"-pthread" [ check-target-builds ../config//is_ci_sanitizer_run "Sanitizer CI run" : no ] ] @@ -1448,7 +1447,6 @@ rule get_float128_tests { result += [ run $(source) /boost/test//boost_unit_test_framework/static - /boost/regex//boost_regex/static : # command line : # input files : # requirements diff --git a/tools/Jamfile.v2 b/tools/Jamfile.v2 index eb0055ab1..7630aff97 100644 --- a/tools/Jamfile.v2 +++ b/tools/Jamfile.v2 @@ -222,6 +222,6 @@ install generate_rational_test_install : generate_rational_test : bin #} exe generate_rational_code : generate_rational_code.cpp ; -exe process_perf_results : process_perf_results.cpp ../../regex/build//boost_regex ; +exe process_perf_results : process_perf_results.cpp ; install bin : generate_rational_code process_perf_results ;