Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (6504d1b160bbe823ac404258540ba321fc56bea6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (6504d1b160bbe823ac404258540ba321fc56bea6)
  • Date: Sat, 16 Dec 2023 19:33:28 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

devel/cmake/HISTORY | 4 ++
devel/cmake/PRE_BUILD | 3 +-
devel/cmake/patches/0001-boost-1.84.patch | 45
++++++++++++++++++++++++++++++
3 files changed, 51 insertions(+), 1 deletion(-)

New commits:
commit 6504d1b160bbe823ac404258540ba321fc56bea6
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

devel/cmake: added patch for boost 1.84, quoting++

diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index 4c00c68..e994394 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,7 @@
+2023-12-16 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, patches/0001-boost-1.84.patch: added patch for boost
1.84,
+ quoting++
+
2023-12-14 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 3.28.1

diff --git a/devel/cmake/PRE_BUILD b/devel/cmake/PRE_BUILD
index 598057b..1d78d2a 100755
--- a/devel/cmake/PRE_BUILD
+++ b/devel/cmake/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "${SOURCE_DIRECTORY}" &&
+apply_patch_dir patches &&
# prevent misdetection of qt6 during bootstrap
sed -i '/add_subdirectory(Tests)/D' CMakeLists.txt
diff --git a/devel/cmake/patches/0001-boost-1.84.patch
b/devel/cmake/patches/0001-boost-1.84.patch
new file mode 100644
index 0000000..da39bfc
--- /dev/null
+++ b/devel/cmake/patches/0001-boost-1.84.patch
@@ -0,0 +1,45 @@
+From 9dc0392df0c1e6f18c1a6575d5a8029c7a4f7357 Mon Sep 17 00:00:00 2001
+From: Brad King <brad.king AT kitware.com>
+Date: Thu, 14 Dec 2023 11:33:36 -0500
+Subject: [PATCH] FindBoost: Add support for Boost 1.84
+
+Update the list of known versions.
+
+Run the command
+
+ cmake -DBOOST_DIR=/path/to/boost_1_84_0 \
+ -P Utilities/Scripts/BoostScanDeps.cmake
+
+to extract dependencies from the 1.84.0 source tree.
+They are the same as 1.83's dependencies, so just update
+the version check for warning about newer versions.
+
+Fixes: #25499
+---
+ Modules/FindBoost.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
+index 1f82bb52a11..248ea8b6373 100644
+--- a/Modules/FindBoost.cmake
++++ b/Modules/FindBoost.cmake
+@@ -1394,7 +1394,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
+ set(_Boost_THREAD_DEPENDENCIES chrono atomic)
+ set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono
atomic)
+ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
+- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.84.0 AND NOT
Boost_NO_WARN_NEW_VERSIONS)
++ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.85.0 AND NOT
Boost_NO_WARN_NEW_VERSIONS)
+ message(WARNING "New Boost version may have incorrect or missing
dependencies and imported targets")
+ endif()
+ endif()
+@@ -1669,6 +1669,7 @@ else()
+ # _Boost_COMPONENT_HEADERS. See the instructions at the top of
+ # _Boost_COMPONENT_DEPENDENCIES.
+ set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
++ "1.84.0" "1.84"
+ "1.83.0" "1.83" "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80"
"1.79.0" "1.79"
+ "1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75"
"1.74.0" "1.74"
+ "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70"
"1.69.0" "1.69"
+--
+GitLab
+



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (6504d1b160bbe823ac404258540ba321fc56bea6), Pavel Vinogradov, 12/16/2023

Archive powered by MHonArc 2.6.24.

Top of Page