-
Notifications
You must be signed in to change notification settings - Fork 339
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump websocket to fix empty glob (#3104)
boost.asio had an issue with empty glob which I wanted to fix with #3084 and it was actually fixed as part of #3074. This PR uses the fixed boost.asio version. * needs skip url stability check
- Loading branch information
Showing
6 changed files
with
88 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
module( | ||
name = "websocketpp", | ||
version = "0.8.2.bcr.3", | ||
compatibility_level = 1, | ||
) | ||
bazel_dep(name = "asio", version = "1.28.2") | ||
bazel_dep(name = "bazel_skylib", version = "1.7.1") | ||
bazel_dep(name = "boost.asio", version = "1.83.0.bcr.1") | ||
bazel_dep(name = "platforms", version = "0.0.10") | ||
bazel_dep(name = "rules_cc", version = "0.0.9") | ||
bazel_dep(name = "zlib", version = "1.3") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") | ||
load("@rules_cc//cc:defs.bzl", "cc_library") | ||
|
||
bool_flag( | ||
name = "use_boost", | ||
build_setting_default = False, | ||
) | ||
|
||
config_setting( | ||
name = "use_boost_setting", | ||
flag_values = {":use_boost": "True"}, | ||
) | ||
|
||
cc_library( | ||
name = "websocketpp", | ||
hdrs = glob(["websocketpp/**/*.hpp"]), | ||
defines = select({ | ||
":use_boost_setting": ["_WEBSOCKETPP_CPP11_STL_"], | ||
"//conditions:default": [ | ||
"_WEBSOCKETPP_CPP11_STL_", | ||
"ASIO_STANDALONE", | ||
], | ||
}), | ||
includes = ["."], | ||
linkopts = select({ | ||
"@platforms//os:osx": [ | ||
"-lpthread", | ||
], | ||
"//conditions:default": [ | ||
"-lpthread", | ||
"-lrt", | ||
], | ||
}), | ||
visibility = ["//visibility:public"], | ||
deps = [ | ||
"@zlib", | ||
] + select({ | ||
":use_boost_setting": ["@boost.asio"], | ||
"//conditions:default": ["@asio"], | ||
}), | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../MODULE.bazel |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
matrix: | ||
platform: | ||
- debian10 | ||
- ubuntu2004 | ||
- macos | ||
- macos_arm64 | ||
bazel: | ||
- 7.x | ||
tasks: | ||
verify_targets: | ||
name: Verify build targets | ||
platform: ${{ platform }} | ||
bazel: ${{ bazel }} | ||
build_targets: | ||
- "@websocketpp" | ||
verify_targets_boost: | ||
name: Verify build targets using boost asio | ||
platform: ${{ platform }} | ||
bazel: ${{ bazel }} | ||
build_targets: | ||
- "@websocketpp" | ||
build_flags: | ||
- '--@websocketpp//:use_boost=true' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
{ | ||
"url": "https://github.com/zaphoyd/websocketpp/archive/refs/tags/0.8.2.tar.gz", | ||
"integrity": "sha256-bOiJ2F7Nwtj6B0CNZ4fnNSUQdQ2qZrWtRKrLR76nZ1U=", | ||
"strip_prefix": "websocketpp-0.8.2", | ||
"overlay": { | ||
"MODULE.bazel": "sha256-4+VsPEhXsnPBJNVPuYf6lrx22I42rUkk2HQKmiwH11s=", | ||
"BUILD.bazel": "sha256-Awc0CFGb0fJhuWFn/zl7DUM/95rnuXc+k8YN7D5QQWE=" | ||
}, | ||
"patch_strip": 0 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,8 @@ | |
"versions": [ | ||
"0.8.2", | ||
"0.8.2.bcr.1", | ||
"0.8.2.bcr.2" | ||
"0.8.2.bcr.2", | ||
"0.8.2.bcr.3" | ||
], | ||
"yanked_versions": {} | ||
} |