From f2c91b2d897ebbc7f4531ed46e6a650a582a92ff Mon Sep 17 00:00:00 2001
From: yurybura <yurybura@gmail.com>
Date: Thu, 24 Dec 2020 04:16:42 +0300
Subject: [boost] update to 1.75.0 (#15090)

---
 scripts/boost/post-source-stubs/atomic.cmake |  8 ++++++++
 scripts/boost/post-source-stubs/log.cmake    |  8 ++++----
 scripts/boost/post-source-stubs/nowide.cmake | 10 +++-------
 3 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 scripts/boost/post-source-stubs/atomic.cmake

(limited to 'scripts/boost/post-source-stubs')

diff --git a/scripts/boost/post-source-stubs/atomic.cmake b/scripts/boost/post-source-stubs/atomic.cmake
new file mode 100644
index 000000000..0715d20f7
--- /dev/null
+++ b/scripts/boost/post-source-stubs/atomic.cmake
@@ -0,0 +1,8 @@
+file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents)
+string(REPLACE
+    "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]"
+    "project.load [ path.join [ path.make $(here:D) ] config/checks/architecture ]"
+    _contents "${_contents}")
+file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
+
diff --git a/scripts/boost/post-source-stubs/log.cmake b/scripts/boost/post-source-stubs/log.cmake
index 78500ddc3..be17a0419 100644
--- a/scripts/boost/post-source-stubs/log.cmake
+++ b/scripts/boost/post-source-stubs/log.cmake
@@ -4,10 +4,10 @@ string(REPLACE " <conditional>@select-arch-specific-sources" "#<conditional>@sel
 file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
 
-file(READ ${SOURCE_PATH}/build/log-architecture.jam _contents)
+file(READ ${SOURCE_PATH}/build/log-arch-config.jam _contents)
 string(REPLACE
-    "\nproject.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ] ;"
-    "\nproject.load [ path.join [ path.make $(here:D) ] config/checks/architecture ] ;"
+    "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]"
+    "project.load [ path.join [ path.make $(here:D) ] config/checks/architecture ]"
     _contents "${_contents}")
-file(WRITE ${SOURCE_PATH}/build/log-architecture.jam "${_contents}")
+file(WRITE ${SOURCE_PATH}/build/log-arch-config.jam "${_contents}")
 
diff --git a/scripts/boost/post-source-stubs/nowide.cmake b/scripts/boost/post-source-stubs/nowide.cmake
index 4005c3a80..a52342259 100644
--- a/scripts/boost/post-source-stubs/nowide.cmake
+++ b/scripts/boost/post-source-stubs/nowide.cmake
@@ -1,11 +1,7 @@
 file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents)
-
 string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}")
-
-string(REPLACE "check-target-builds cxx11_moveable_fstreams" "check-target-builds ../check_movable_fstreams.cpp" _contents "${_contents}")
-string(REPLACE "check-target-builds lfs_support" "check-target-builds ../check_lfs_support.cpp" _contents "${_contents}")
-
+string(REPLACE "check-target-builds ../config//cxx11_moveable_fstreams" "check-target-builds ../check_movable_fstreams.cpp" _contents "${_contents}")
+string(REPLACE "check-target-builds ../config//lfs_support" "check-target-builds ../check_lfs_support.cpp" _contents "${_contents}")
 file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
-
-file(COPY "${SOURCE_PATH}/test/check_lfs_support.cpp" "${SOURCE_PATH}/test/check_movable_fstreams.cpp" DESTINATION "${SOURCE_PATH}/build/config")
+file(COPY "${SOURCE_PATH}/config/check_lfs_support.cpp" "${SOURCE_PATH}/config/check_movable_fstreams.cpp" DESTINATION "${SOURCE_PATH}/build/config")
-- 
cgit v1.2.3