From 7e49e8f96b3ba9554aae96348c1c3a0eb0f09918 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Fri, 23 Aug 2024 19:43:03 +0300
Subject: [PATCH] Update build.jam, test/Jamfile

---
 build.jam       | 17 +++++++----------
 test/Jamfile.v2 | 24 +++++++++++++-----------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/build.jam b/build.jam
index 27dc618..dc09d65 100644
--- a/build.jam
+++ b/build.jam
@@ -1,7 +1,7 @@
-# Copyright René Ferdinand Rivera Morell 2023-2024
+# Copyright 2023-2024 René Ferdinand Rivera Morell
+# Copyright 2024 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
+# https://www.boost.org/LICENSE_1_0.txt
 
 require-b2 5.2 ;
 
@@ -9,18 +9,15 @@ constant boost_dependencies :
     /boost/assert//boost_assert
     /boost/config//boost_config
     /boost/throw_exception//boost_throw_exception
-    /boost/type_traits//boost_type_traits ;
-
-project /boost/uuid
-    : common-requirements
-        <include>include
+    /boost/type_traits//boost_type_traits
     ;
 
+project /boost/uuid ;
+
 explicit
-    [ alias boost_uuid : : : : <library>$(boost_dependencies) ]
+    [ alias boost_uuid : : : : <include>include <library>$(boost_dependencies) ]
     [ alias all : boost_uuid test ]
     ;
 
 call-if : boost-library uuid
     ;
-
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 7e504ed..81463fa 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -7,11 +7,8 @@
 project
     : requirements
       <warnings>pedantic
-      <library>/boost/array//boost_array
+      <library>/boost/uuid//boost_uuid
       <library>/boost/core//boost_core
-      <library>/boost/container_hash//boost_container_hash
-      <library>/boost/predef//boost_predef
-      <library>/boost/random//boost_random
 ;
 
 import os ;
@@ -59,8 +56,8 @@ run test_include1.cpp test_include2.cpp ;
 # main tests
 
 run test_uuid.cpp
-   : : : <define>BOOST_UUID_REPORT_IMPLEMENTATION ;
-run test_uuid.cpp : : : <define>BOOST_UUID_NO_SIMD <define>BOOST_UUID_REPORT_IMPLEMENTATION : test_uuid_no_simd ;
+   : : : <library>/boost/container_hash//boost_container_hash <define>BOOST_UUID_REPORT_IMPLEMENTATION ;
+run test_uuid.cpp : : : <library>/boost/container_hash//boost_container_hash <define>BOOST_UUID_NO_SIMD <define>BOOST_UUID_REPORT_IMPLEMENTATION : test_uuid_no_simd ;
 run test_uuid_2.cpp ;
 run test_uuid_3.cpp ;
 
@@ -80,7 +77,8 @@ run test_comparison.cpp : : : <define>BOOST_UUID_NO_SIMD <define>BOOST_UUID_REPO
 
 # test uuid_io.hpp
 
-run test_io.cpp : : : <library>/boost/lexical_cast//boost_lexical_cast ;
+run test_io.cpp
+  : : : <library>/boost/lexical_cast//boost_lexical_cast <library>/boost/predef//boost_predef ;
 run test_io_2.cpp ;
 run test_to_chars.cpp ;
 run test_to_chars_2.cpp ;
@@ -93,9 +91,11 @@ run test_uuid_clock.cpp ;
 
 run test_nil_generator.cpp ;
 run test_string_generator.cpp ;
-run test_random_generator.cpp ;
+run test_random_generator.cpp
+  : : : <library>/boost/random//boost_random <library>/boost/predef//boost_predef ;
 
-run test_name_generator.cpp ;
+run test_name_generator.cpp
+  : : : <library>/boost/predef//boost_predef ;
 run test_namespaces.cpp ;
 run test_name_generator_md5.cpp ;
 run test_name_generator_sha1.cpp ;
@@ -150,7 +150,8 @@ run test_uuid_in_map.cpp ;
 
 # test hashing support
 
-run test_hash.cpp ;
+run test_hash.cpp
+   : : : <library>/boost/container_hash//boost_container_hash ;
 run test_hash_value.cpp ;
 
 run test_std_unordered.cpp ;
@@ -182,7 +183,8 @@ run test_bench_random.cpp /boost/timer//boost_timer : : : <toolset>clang-cloudab
 # tests for the header-only random provider
 
 run test_entropy_error.cpp ;
-run test_detail_random_provider.cpp ;
+run test_detail_random_provider.cpp
+  : : : <library>/boost/array//boost_array ;
 
 # 'quick' test for CI