| 1 |
commit: 2358d1d626fc0d6dbaf3ddab9932671498d27099 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 26 11:30:59 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 26 11:32:35 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2358d1d6 |
| 7 |
|
| 8 |
dev-util/cmake: Revbump to add boost-1.76 support |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/791712 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
...{cmake-3.20.2.ebuild => cmake-3.20.2-r1.ebuild} | 1 + |
| 14 |
dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch | 46 ++++++++++++++++++++++ |
| 15 |
2 files changed, 47 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-util/cmake/cmake-3.20.2.ebuild b/dev-util/cmake/cmake-3.20.2-r1.ebuild |
| 18 |
similarity index 99% |
| 19 |
rename from dev-util/cmake/cmake-3.20.2.ebuild |
| 20 |
rename to dev-util/cmake/cmake-3.20.2-r1.ebuild |
| 21 |
index 95de22ba838..627ca4f7a02 100644 |
| 22 |
--- a/dev-util/cmake/cmake-3.20.2.ebuild |
| 23 |
+++ b/dev-util/cmake/cmake-3.20.2-r1.ebuild |
| 24 |
@@ -71,6 +71,7 @@ PATCHES=( |
| 25 |
|
| 26 |
# upstream fixes (can usually be removed with a version bump) |
| 27 |
"${FILESDIR}"/${P}-sphinx-4.patch # bug 789375 |
| 28 |
+ "${FILESDIR}"/${P}-boost-1.76.patch # bug 791712 |
| 29 |
) |
| 30 |
|
| 31 |
cmake_src_bootstrap() { |
| 32 |
|
| 33 |
diff --git a/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch b/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch |
| 34 |
new file mode 100644 |
| 35 |
index 00000000000..898f8a75d7e |
| 36 |
--- /dev/null |
| 37 |
+++ b/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch |
| 38 |
@@ -0,0 +1,46 @@ |
| 39 |
+From 79be37b94e7353ec056e6343ba293ce1b60627d4 Mon Sep 17 00:00:00 2001 |
| 40 |
+From: Brad King <brad.king@×××××××.com> |
| 41 |
+Date: Fri, 7 May 2021 08:51:40 -0400 |
| 42 |
+Subject: [PATCH] FindBoost: Add support for Boost 1.76 |
| 43 |
+ |
| 44 |
+Update the list of known versions. |
| 45 |
+ |
| 46 |
+Run the command |
| 47 |
+ |
| 48 |
+ cmake -DBOOST_DIR=/path/to/boost_1_76_0 \ |
| 49 |
+ -P Utilities/Scripts/BoostScanDeps.cmake |
| 50 |
+ |
| 51 |
+to extract dependencies from the 1.76.0 source tree. |
| 52 |
+They are the same as 1.75's dependencies, so just update |
| 53 |
+the version check for warning about newer versions. |
| 54 |
+ |
| 55 |
+Fixes: #22167 |
| 56 |
+--- |
| 57 |
+ Modules/FindBoost.cmake | 4 ++-- |
| 58 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 59 |
+ |
| 60 |
+diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake |
| 61 |
+index f8887ad2be..d31f925cb6 100644 |
| 62 |
+--- a/Modules/FindBoost.cmake |
| 63 |
++++ b/Modules/FindBoost.cmake |
| 64 |
+@@ -1350,7 +1350,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) |
| 65 |
+ set(_Boost_TIMER_DEPENDENCIES chrono) |
| 66 |
+ set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic) |
| 67 |
+ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) |
| 68 |
+- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.76.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) |
| 69 |
++ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.77.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) |
| 70 |
+ message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") |
| 71 |
+ endif() |
| 72 |
+ endif() |
| 73 |
+@@ -1622,7 +1622,7 @@ else() |
| 74 |
+ # _Boost_COMPONENT_HEADERS. See the instructions at the top of |
| 75 |
+ # _Boost_COMPONENT_DEPENDENCIES. |
| 76 |
+ set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} |
| 77 |
+- "1.75.0" "1.75" "1.74.0" "1.74" |
| 78 |
++ "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74" |
| 79 |
+ "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" |
| 80 |
+ "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" |
| 81 |
+ "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60" |
| 82 |
+-- |
| 83 |
+GitLab |
| 84 |
+ |
Archives