Skip to content

Commit

Permalink
Bump Boost to version 1.80.0 (#258)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vertexwahn
Vertexwahn authored Aug 13, 2022
1 parent 0387650 commit c3fae06
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 79 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

- run: apt-get update && apt-get -y install pkg-config zip g++ zlib1g-dev unzip python curl ocl-icd-opencl-dev opencl-headers
- run: cd /tmp/ &&
curl -LO https://github.com/bazelbuild/bazel/releases/download/5.1.1/bazel-5.1.1-installer-linux-x86_64.sh &&
bash /tmp/bazel-5.1.1-installer-linux-x86_64.sh
curl -LO https://github.com/bazelbuild/bazel/releases/download/5.2.0/bazel-5.2.0-installer-linux-x86_64.sh &&
bash /tmp/bazel-5.2.0-installer-linux-x86_64.sh
- run: cd test && cp .bazelrc.ci .bazelrc
- run: cd test && bazel test --test_output=errors //...
49 changes: 0 additions & 49 deletions 0001-json-array-erase-relocate.patch
View file

This file was deleted.

0 BUILD → BUILD.bazel
View file
File renamed without changes.
58 changes: 34 additions & 24 deletions BUILD.boost
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ BOOST_CTX_ASM_SOURCES = selects.with_or({
"libs/context/src/asm/make_x86_64_sysv_elf_gas.S",
"libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S",
],
("@platforms//os:osx", "@platforms//os:ios", "@platforms//os:watchos", "@platforms//os:tvos") : ["apple_ctx_asm_sources"],
("@platforms//os:osx", "@platforms//os:ios", "@platforms//os:watchos", "@platforms//os:tvos"): ["apple_ctx_asm_sources"],
":windows_x86_64": [
"libs/context/src/asm/make_x86_64_ms_pe_masm.S",
"libs/context/src/asm/jump_x86_64_ms_pe_masm.S",
Expand All @@ -143,7 +143,7 @@ filegroup(
"libs/context/src/asm/make_x86_64_sysv_macho_gas.S",
"libs/context/src/asm/ontop_x86_64_sysv_macho_gas.S",
],
})
}),
)

boost_library(
Expand All @@ -157,15 +157,15 @@ boost_library(
],
"//conditions:default": [],
}),
local_defines = select({
":windows_x86_64": ["BOOST_CONTEXT_EXPORT="],
"//conditions:default": [],
}),
exclude_src = [
"libs/context/src/fiber.cpp",
"libs/context/src/untested.cpp",
"libs/context/src/continuation.cpp",
],
local_defines = select({
":windows_x86_64": ["BOOST_CONTEXT_EXPORT="],
"//conditions:default": [],
}),
visibility = ["//visibility:public"],
deps = [
":assert",
Expand Down Expand Up @@ -563,7 +563,7 @@ boost_library(
# OpenCL (required for Boost.Compute) is deprecated on macOS and not supported on other Apple OSs.
# This will at least produce the right error message, indicating that OpenCL is not present
("@platforms//os:osx", "@platforms//os:ios", "@platforms//os:watchos", "@platforms//os:tvos"): [
"-framework OpenCL",
"-framework OpenCL",
],
"//conditions:default": [
"-lOpenCL",
Expand Down Expand Up @@ -821,7 +821,12 @@ boost_library(
copts = _w_no_deprecated,
defines = [
"BOOST_FILESYSTEM_NO_CXX20_ATOMIC_REF",
],
] + select({
"@platforms//os:linux": [
"BOOST_FILESYSTEM_HAS_POSIX_AT_APIS",
],
"//conditions:default": [],
}),
deps = [
":atomic",
":config",
Expand Down Expand Up @@ -1141,35 +1146,35 @@ boost_library(

BOOST_LOCALE_COMMON_SOURCES = glob(
[
"libs/locale/src/encoding/*.cpp",
"libs/locale/src/encoding/*.hpp",
"libs/locale/src/encoding/*.ipp",
"libs/locale/src/shared/*.cpp",
"libs/locale/src/shared/*.hpp",
"libs/locale/src/std/*.cpp",
"libs/locale/src/std/*.hpp",
"libs/locale/src/util/*.cpp",
"libs/locale/src/util/*.hpp",
"libs/locale/src/boost/locale/encoding/*.cpp",
"libs/locale/src/boost/locale/encoding/*.hpp",
"libs/locale/src/boost/locale/encoding/*.ipp",
"libs/locale/src/boost/locale/shared/*.cpp",
"libs/locale/src/boost/locale/shared/*.hpp",
"libs/locale/src/boost/locale/std/*.cpp",
"libs/locale/src/boost/locale/std/*.hpp",
"libs/locale/src/boost/locale/util/*.cpp",
"libs/locale/src/boost/locale/util/*.hpp",
],
exclude = [
"libs/locale/src/util/iconv.hpp",
"libs/locale/src/boost/locale/util/iconv.hpp",
],
)

BOOST_LOCALE_STD_SOURCES = BOOST_LOCALE_COMMON_SOURCES + [
"libs/locale/src/util/iconv.hpp",
"libs/locale/src/boost/locale/util/iconv.hpp",
]

BOOST_LOCALE_POSIX_SOURCES = BOOST_LOCALE_COMMON_SOURCES + [
"libs/locale/src/util/iconv.hpp",
"libs/locale/src/boost/locale/util/iconv.hpp",
] + glob([
"libs/locale/src/posix/*.cpp",
"libs/locale/src/posix/*.hpp",
"libs/locale/src/boost/locale/posix/*.cpp",
"libs/locale/src/boost/locale/posix/*.hpp",
])

BOOST_LOCALE_WIN32_SOURCES = BOOST_LOCALE_COMMON_SOURCES + glob([
"libs/locale/src/win32/*.cpp",
"libs/locale/src/win32/*.hpp",
"libs/locale/src/boost/locale/win32/*.cpp",
"libs/locale/src/boost/locale/win32/*.hpp",
])

BOST_LOCALE_STD_COPTS = [
Expand Down Expand Up @@ -1199,6 +1204,7 @@ boost_library(
("@platforms//os:linux", "@platforms//os:osx", "@platforms//os:ios", "@platforms//os:watchos", "@platforms//os:tvos"): BOOST_LOCALE_POSIX_COPTS,
":windows_x86_64": BOOST_LOCALE_WIN32_COPTS,
}) + _w_no_deprecated,
includes = ["libs/locale/src/"],
deps = [
":assert",
":config",
Expand Down Expand Up @@ -2093,6 +2099,9 @@ boost_library(

boost_library(
name = "unordered",
srcs = glob([
"boost/unordered_map/**/*.hpp",
]),
hdrs = [
"boost/unordered_map.hpp",
"boost/unordered_set.hpp",
Expand All @@ -2106,6 +2115,7 @@ boost_library(
":iterator",
":limits",
":move",
":mp11",
":preprocessor",
":smart_ptr",
":swap",
Expand Down
0 WORKSPACE → WORKSPACE.bazel
View file
File renamed without changes.
7 changes: 3 additions & 4 deletions boost/boost.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,12 @@ def boost_deps():
http_archive,
name = "boost",
build_file = "@com_github_nelhage_rules_boost//:BUILD.boost",
patches = ["@com_github_nelhage_rules_boost//:0001-json-array-erase-relocate.patch"],
patch_cmds = ["rm -f doc/pdf/BUILD"],
patch_cmds_win = ["Remove-Item -Force doc/pdf/BUILD"],
sha256 = "273f1be93238a068aba4f9735a4a2b003019af067b9c183ed227780b8f36062c",
strip_prefix = "boost_1_79_0",
sha256 = "4b2136f98bdd1f5857f1c3dea9ac2018effe65286cf251534b6ae20cc45e1847",
strip_prefix = "boost_1_80_0",
urls = [
"https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.gz",
"https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.gz",
],
)

Expand Down
0 src/BUILD → src/BUILD.bazel
View file
File renamed without changes.
1 change: 1 addition & 0 deletions test/BUILD → test/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ cc_test(
srcs = ["gil_test.cc"],
deps = [
"@boost//:gil",
"@boost//:functional"
],
)

Expand Down
0 test/WORKSPACE → test/WORKSPACE.bazel
View file
File renamed without changes.

0 comments on commit c3fae06

Please sign in to comment.