Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dependency_support: boost: bump boost to v1.82 #164

Merged
merged 2 commits into from
Jun 13, 2023
Merged

dependency_support: boost: bump boost to v1.82 #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cdab41
dependency_support: boost: bump boost to v1.82
lpawelcz May 24, 2023
8b420ac
dependency_support: spdlog: bump to v1.11.0
lpawelcz Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions dependency_support/boost/add_python.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.

diff --git BUILD.boost BUILD.boost
index e6b28cf..99470c5 100644
--- BUILD.boost
+++ BUILD.boost
@@ -2268,3 +2268,41 @@ boost_library(
":utility",
diff --git boost.BUILD boost.BUILD
index e5d0b60..4f52d3c 100644
--- boost.BUILD
+++ boost.BUILD
@@ -2642,3 +2642,44 @@ boost_library(
":variant2",
],
)
+
Expand All @@ -27,6 +27,9 @@ index e6b28cf..99470c5 100644
+ "libs/python/src/converter/*.cpp",
+ "libs/python/src/object/*.cpp",
+ ]),
+ exclude_src = [
+ "libs/python/src/fabscript",
+ ],
+ deps = [
+ ":assert",
+ ":bind",
Expand Down
4 changes: 2 additions & 2 deletions dependency_support/boost/boost.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ def boost():
maybe(
git_repository,
name = "com_github_nelhage_rules_boost",
# This equivalent to boost 1.78
commit = "c8b9b4a75c4301778d2e256b8d72ce47a6c9a1a4",
# This equivalent to boost 1.82
commit = "1217caae292dc9f14e8109777ba43c988cf89c5b",
remote = "https://github.com/nelhage/rules_boost",
shallow_since = "1640124117 -0800",
patches = [
Expand Down
14 changes: 7 additions & 7 deletions dependency_support/boost/libbacktrace.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git BUILD.boost BUILD.boost
index e23893b..1e70e11 100644
--- BUILD.boost
+++ BUILD.boost
@@ -1874,6 +1874,7 @@ boost_library(
":lexical_cast",
diff --git boost.BUILD boost.BUILD
index e5d0b60..bade47f 100644
--- boost.BUILD
+++ boost.BUILD
@@ -1927,6 +1927,7 @@ boost_library(
":predef",
":static_assert",
":type_traits",
+ "@com_github_libbacktrace//:libbacktrace",
],
)


6 changes: 3 additions & 3 deletions dependency_support/com_github_gabime_spdlog/com_github_gabime_spdlog.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ def com_github_gabime_spdlog():
http_archive,
name = "com_github_gabime_spdlog",
urls = [
"https://github.com/gabime/spdlog/archive/refs/tags/v1.9.2.tar.gz",
"https://github.com/gabime/spdlog/archive/refs/tags/v1.11.0.tar.gz",
],
strip_prefix = "spdlog-1.9.2",
sha256 = "6fff9215f5cb81760be4cc16d033526d1080427d236e86d70bb02994f85e3d38",
strip_prefix = "spdlog-1.11.0",
sha256 = "ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb",
build_file = Label("@rules_hdl//dependency_support/com_github_gabime_spdlog:bundled.BUILD.bazel"),
)