mirror of
https://github.com/google/sandboxed-api.git
synced 2024-03-22 13:11:30 +08:00
Update dependencies to newer version
- Same upstream dependency versions for CMake and Bazel - Use maybe() from build_defs to conditionally define Bazel repositories PiperOrigin-RevId: 282331418 Change-Id: I8a7db84a1d3115f3c1f31cc1dfcc8c29fe391a62
This commit is contained in:
Christian Blichmann
Copybara-Service
parent
3cbd871454
commit
4f892864c8
25
WORKSPACE
25
WORKSPACE
|
|
@ -15,6 +15,7 @@
|
|||
workspace(name = "com_google_sandboxed_api")
|
||||
|
||||
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
|
||||
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
|
||||
load("//sandboxed_api/bazel:sapi_deps.bzl", "sapi_deps")
|
||||
|
||||
# Load common dependencies, then Protobuf's
|
||||
|
|
@ -36,22 +37,28 @@ http_archive(
|
|||
# We are investigating better ways to avoid this issue. For most "normal"
|
||||
# C and C++ headers, parsing just works.
|
||||
patches = ["//sandboxed_api:bazel/external/zlib.patch"],
|
||||
sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
|
||||
sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1", # 2017-01-15
|
||||
strip_prefix = "zlib-1.2.11",
|
||||
urls = ["https://www.zlib.net/zlib-1.2.11.tar.gz"],
|
||||
urls = [
|
||||
"https://mirror.bazel.build/zlib.net/zlib-1.2.11.tar.gz",
|
||||
"https://www.zlib.net/zlib-1.2.11.tar.gz",
|
||||
],
|
||||
)
|
||||
|
||||
# GoogleTest/GoogleMock
|
||||
http_archive(
|
||||
maybe(
|
||||
http_archive,
|
||||
name = "com_google_googletest",
|
||||
sha256 = "baed63b97595c32667694de0a434f8f23da59609c4a44f3360ba94b0abd5c583",
|
||||
strip_prefix = "googletest-8ffb7e5c88b20a297a2e786c480556467496463b",
|
||||
urls = ["https://github.com/google/googletest/archive/8ffb7e5c88b20a297a2e786c480556467496463b.zip"], # 2019-05-30
|
||||
sha256 = "ba5b04a4849246e7c16ba94227eed46486ef942f61dc8b78609732543c19c9f4", # 2019-11-21
|
||||
strip_prefix = "googletest-200ff599496e20f4e39566feeaf2f6734ca7570f",
|
||||
urls = ["https://github.com/google/googletest/archive/200ff599496e20f4e39566feeaf2f6734ca7570f.zip"],
|
||||
)
|
||||
|
||||
# Google Benchmark
|
||||
http_archive(
|
||||
maybe(
|
||||
http_archive,
|
||||
name = "com_google_benchmark",
|
||||
strip_prefix = "benchmark-master",
|
||||
urls = ["https://github.com/google/benchmark/archive/master.zip"],
|
||||
sha256 = "9067442aa447e54cc144160420daf37fcd0663ccf3057ce2d87b9d7f6ad45d3f", # 2019-11-05
|
||||
strip_prefix = "benchmark-c50ac68c50ff8da3827cd6720792117910d85666",
|
||||
urls = ["https://github.com/google/benchmark/archive/c50ac68c50ff8da3827cd6720792117910d85666.zip"],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ project(absl-download NONE)
|
|||
include(ExternalProject)
|
||||
ExternalProject_Add(absl
|
||||
GIT_REPOSITORY https://github.com/abseil/abseil-cpp
|
||||
GIT_TAG c6c3c1b498e4ee939b24be59cae29d59c3863be8 # 2019-07-18
|
||||
GIT_TAG 8ba96a8244bbe334d09542e92d566673a65c1f78 # 2019-11-19
|
||||
SOURCE_DIR "${CMAKE_BINARY_DIR}/absl-src"
|
||||
BINARY_DIR "${CMAKE_BINARY_DIR}/absl-build"
|
||||
CONFIGURE_COMMAND ""
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ project(benchmark-download NONE)
|
|||
include(ExternalProject)
|
||||
ExternalProject_Add(benchmark
|
||||
GIT_REPOSITORY https://github.com/google/benchmark.git
|
||||
GIT_TAG 090faecb454fbd6e6e17a75ef8146acb037118d4 # 2019-05-13
|
||||
GIT_TAG c50ac68c50ff8da3827cd6720792117910d85666 # 2019-11-05
|
||||
SOURCE_DIR "${CMAKE_BINARY_DIR}/benchmark-src"
|
||||
BINARY_DIR "${CMAKE_BINARY_DIR}/benchmark-build"
|
||||
CONFIGURE_COMMAND ""
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ project(gflags-download NONE)
|
|||
include(ExternalProject)
|
||||
ExternalProject_Add(gflags
|
||||
GIT_REPOSITORY https://github.com/gflags/gflags.git
|
||||
GIT_TAG 28f50e0fed19872e0fd50dd23ce2ee8cd759338e # 2019-01-25
|
||||
GIT_TAG d9b184bd0026b16bb4c2fded75d56fb2cce50d66 # 2019-11-13
|
||||
SOURCE_DIR "${CMAKE_BINARY_DIR}/gflags-src"
|
||||
BINARY_DIR "${CMAKE_BINARY_DIR}/gflags-build"
|
||||
CONFIGURE_COMMAND ""
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ project(glog-download NONE)
|
|||
include(ExternalProject)
|
||||
ExternalProject_Add(glog
|
||||
GIT_REPOSITORY https://github.com/google/glog.git
|
||||
GIT_TAG ba8a9f6952d04d1403b97df24e6836227751454e # 2019-05-07
|
||||
GIT_TAG 925858d9969d8ee22aabc3635af00a37891f4e25 # 2019-11-04
|
||||
SOURCE_DIR "${CMAKE_BINARY_DIR}/glog-src"
|
||||
BINARY_DIR "${CMAKE_BINARY_DIR}/glog-build"
|
||||
CONFIGURE_COMMAND ""
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ project(googletest-download NONE)
|
|||
include(ExternalProject)
|
||||
ExternalProject_Add(googletest
|
||||
GIT_REPOSITORY https://github.com/google/googletest.git
|
||||
GIT_TAG 2ef13f524b837a68bae27ae1123da0400dff6285 # 2019-07-18
|
||||
GIT_TAG 200ff599496e20f4e39566feeaf2f6734ca7570f # 2019-11-21
|
||||
SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src"
|
||||
BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build"
|
||||
CONFIGURE_COMMAND ""
|
||||
|
|
|
|||
|
|
@ -18,10 +18,9 @@ project(protobuf-download NONE)
|
|||
include(ExternalProject)
|
||||
ExternalProject_Add(protobuf
|
||||
GIT_REPOSITORY https://github.com/protocolbuffers/protobuf.git
|
||||
GIT_TAG e08f01ce6a78a6cf2834dfa37281eb366eb0c5c3 # 2019-06-05
|
||||
GIT_TAG v3.10.1 # 2019-10-29
|
||||
SOURCE_DIR "${CMAKE_BINARY_DIR}/protobuf-src"
|
||||
BINARY_DIR "${CMAKE_BINARY_DIR}/protobuf-build"
|
||||
PATCH_COMMAND "${CMAKE_COMMAND}" -E touch "${CMAKE_BINARY_DIR}/protobuf-src/src/google/protobuf/stubs/io_win32.h"
|
||||
CONFIGURE_COMMAND ""
|
||||
BUILD_COMMAND ""
|
||||
INSTALL_COMMAND ""
|
||||
|
|
|
|||
12
sandboxed_api/bazel/external/libcap.BUILD
vendored
12
sandboxed_api/bazel/external/libcap.BUILD
vendored
|
|
@ -13,9 +13,9 @@
|
|||
# limitations under the License.
|
||||
|
||||
genrule(
|
||||
name = "cap_names_sed",
|
||||
srcs = ["libcap/include/linux/capability.h"],
|
||||
outs = ["cap_names.sed"],
|
||||
name = "cap_names_list_h",
|
||||
srcs = ["libcap/include/uapi/linux/capability.h"],
|
||||
outs = ["cap_names.list.h"],
|
||||
# Use the same logic as libcap/Makefile
|
||||
cmd = """
|
||||
sed -ne '/^#define[ \\t]CAP[_A-Z]\+[ \\t]\+[0-9]\+/{s/^#define \([^ \\t]*\)[ \\t]*\([^ \\t]*\)/\{\"\\1\",\\2\},/p;}' $< | \\
|
||||
|
|
@ -27,8 +27,8 @@ genrule(
|
|||
cc_library(
|
||||
name = "makenames_textual_hdrs",
|
||||
textual_hdrs = [
|
||||
"cap_names.sed",
|
||||
"libcap/include/linux/capability.h",
|
||||
":cap_names.list.h",
|
||||
"libcap/include/uapi/linux/capability.h",
|
||||
],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
|
@ -75,9 +75,11 @@ cc_library(
|
|||
includes = [
|
||||
"libcap",
|
||||
"libcap/include",
|
||||
"libcap/include/uapi",
|
||||
],
|
||||
textual_hdrs = [
|
||||
"libcap/include/sys/capability.h",
|
||||
"libcap/include/uapi/linux/capability.h",
|
||||
"libcap/libcap.h",
|
||||
"libcap/cap_names.h",
|
||||
],
|
||||
|
|
|
|||
|
|
@ -15,92 +15,93 @@
|
|||
"""Loads dependencies needed to compile Sandboxed API for 3rd-party consumers."""
|
||||
|
||||
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
|
||||
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
|
||||
load("//sandboxed_api/bazel:repositories.bzl", "autotools_repository")
|
||||
|
||||
def sapi_deps():
|
||||
"""Loads common dependencies needed to compile Sandboxed API."""
|
||||
|
||||
# Bazel Skylib, needed by newer Protobuf builds
|
||||
if "bazel_skylib" not in native.existing_rules():
|
||||
http_archive(
|
||||
maybe(
|
||||
http_archive,
|
||||
name = "bazel_skylib",
|
||||
sha256 = "2ef429f5d7ce7111263289644d233707dba35e39696377ebab8b0bc701f7818e",
|
||||
url = "https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz", # 2019-03-20
|
||||
sha256 = "1dde365491125a3db70731e25658dfdd3bc5dbdfd11b840b3e987ecf043c7ca0", # 2019-07-12
|
||||
url = "https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz",
|
||||
)
|
||||
|
||||
# Abseil
|
||||
if "com_google_absl" not in native.existing_rules():
|
||||
http_archive(
|
||||
maybe(
|
||||
http_archive,
|
||||
name = "com_google_absl",
|
||||
sha256 = "3c119a995f3bb1e2aa7b3a37efe526172695816d63bb7a001139f25d628b9c6e", # 2019-07-18
|
||||
strip_prefix = "abseil-cpp-278b26058c036833a4f7f3047d3f4d9296527f87",
|
||||
urls = ["https://github.com/abseil/abseil-cpp/archive/278b26058c036833a4f7f3047d3f4d9296527f87.zip"],
|
||||
sha256 = "d8bc776c9702c7875c64410d1380cf3f3c0f75d5df9be08218589579604c539e", # 2019-11-19
|
||||
strip_prefix = "abseil-cpp-8ba96a8244bbe334d09542e92d566673a65c1f78",
|
||||
urls = ["https://github.com/abseil/abseil-cpp/archive/8ba96a8244bbe334d09542e92d566673a65c1f78.zip"],
|
||||
)
|
||||
|
||||
# Abseil-py
|
||||
if "com_google_absl_py" not in native.existing_rules():
|
||||
http_archive(
|
||||
maybe(
|
||||
http_archive,
|
||||
name = "com_google_absl_py",
|
||||
strip_prefix = "abseil-py-master",
|
||||
urls = ["https://github.com/abseil/abseil-py/archive/master.zip"],
|
||||
sha256 = "51e9bbd6fbfedbad5627a782b6912c48a9a46f4b4095389cee586c9d80f6a56e", # 2019-10-25
|
||||
strip_prefix = "abseil-py-62b0407d5e6cd3912d2c7d130cffdf6613018260",
|
||||
urls = ["https://github.com/abseil/abseil-py/archive/62b0407d5e6cd3912d2c7d130cffdf6613018260.zip"],
|
||||
)
|
||||
|
||||
# Abseil-py dependency for Python 2/3 compatiblity
|
||||
if "six_archive" not in native.existing_rules():
|
||||
http_archive(
|
||||
maybe(
|
||||
http_archive,
|
||||
name = "six_archive",
|
||||
build_file = "@com_google_sandboxed_api//sandboxed_api:bazel/external/six.BUILD",
|
||||
sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
|
||||
strip_prefix = "six-1.10.0",
|
||||
sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73", # 2018-12-10
|
||||
strip_prefix = "six-1.12.0",
|
||||
urls = [
|
||||
"http://mirror.bazel.build/pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
|
||||
"https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
|
||||
"https://mirror.bazel.build/pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz",
|
||||
"https://pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz",
|
||||
],
|
||||
)
|
||||
|
||||
# gflags
|
||||
# TODO(cblichmann): Use Abseil flags once compatible with logging
|
||||
if "com_github_gflags_gflags" not in native.existing_rules():
|
||||
http_archive(
|
||||
maybe(
|
||||
http_archive,
|
||||
name = "com_github_gflags_gflags",
|
||||
sha256 = "53b16091efa386ab11e33f018eef0ed489e0ab63554455293cbb0cc2a5f50e98",
|
||||
strip_prefix = "gflags-28f50e0fed19872e0fd50dd23ce2ee8cd759338e",
|
||||
urls = ["https://github.com/gflags/gflags/archive/28f50e0fed19872e0fd50dd23ce2ee8cd759338e.zip"], # 2019-01-25
|
||||
sha256 = "2c3403730ae711b29161b27380548a57204f683cb7152aa645657dcf6c57f72a", # 2019-11-13
|
||||
strip_prefix = "gflags-d9b184bd0026b16bb4c2fded75d56fb2cce50d66",
|
||||
urls = ["https://github.com/gflags/gflags/archive/d9b184bd0026b16bb4c2fded75d56fb2cce50d66.zip"],
|
||||
)
|
||||
|
||||
# Google logging
|
||||
http_archive(
|
||||
maybe(
|
||||
http_archive,
|
||||
name = "com_google_glog",
|
||||
sha256 = "74010e549e3555a11d3eb22b80f0040fa4f013a4b254b2d5ede12afcc92e690b",
|
||||
strip_prefix = "glog-41f4bf9cbc3e8995d628b459f6a239df43c2b84a",
|
||||
urls = ["https://github.com/google/glog/archive/41f4bf9cbc3e8995d628b459f6a239df43c2b84a.zip"], # 2019-02-02
|
||||
sha256 = "dbe787f2a7cf1146f748a191c99ae85d6b931dd3ebdcc76aa7ccae3699149c67", # 2019-11-04
|
||||
strip_prefix = "glog-925858d9969d8ee22aabc3635af00a37891f4e25",
|
||||
urls = ["https://github.com/google/glog/archive/925858d9969d8ee22aabc3635af00a37891f4e25.zip"],
|
||||
)
|
||||
|
||||
# Protobuf
|
||||
if "com_google_protobuf" not in native.existing_rules():
|
||||
http_archive(
|
||||
maybe(
|
||||
http_archive,
|
||||
name = "com_google_protobuf",
|
||||
sha256 = "1e622ce4b84b88b6d2cdf1db38d1a634fe2392d74f0b7b74ff98f3a51838ee53",
|
||||
strip_prefix = "protobuf-3.8.0",
|
||||
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.8.0.zip"],
|
||||
sha256 = "678d91d8a939a1ef9cb268e1f20c14cd55e40361dc397bb5881e4e1e532679b1", # 2019-10-29
|
||||
strip_prefix = "protobuf-3.10.1",
|
||||
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.10.1.zip"],
|
||||
)
|
||||
|
||||
# libcap
|
||||
http_archive(
|
||||
name = "org_kernel_libcap",
|
||||
build_file = "@com_google_sandboxed_api//sandboxed_api:bazel/external/libcap.BUILD",
|
||||
sha256 = "ef83108f77314e50bae926ae473f9b130b15240d17cbae05089e19c36a8676d6",
|
||||
strip_prefix = "libcap-2.13",
|
||||
urls = ["https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.13.tar.gz"],
|
||||
sha256 = "260b549c154b07c3cdc16b9ccc93c04633c39f4fb6a4a3b8d1fa5b8a9c3f5fe8", # 2019-04-16
|
||||
strip_prefix = "libcap-2.27",
|
||||
urls = ["https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.27.tar.gz"],
|
||||
)
|
||||
|
||||
# libffi
|
||||
autotools_repository(
|
||||
name = "org_sourceware_libffi",
|
||||
build_file = "@com_google_sandboxed_api//sandboxed_api:bazel/external/libffi.BUILD",
|
||||
sha256 = "403d67aabf1c05157855ea2b1d9950263fb6316536c8c333f5b9ab1eb2f20ecf",
|
||||
strip_prefix = "libffi-3.3-rc0",
|
||||
urls = ["https://github.com/libffi/libffi/releases/download/v3.3-rc0/libffi-3.3-rc0.tar.gz"],
|
||||
sha256 = "653ffdfc67fbb865f39c7e5df2a071c0beb17206ebfb0a9ecb18a18f63f6b263", # 2019-11-02
|
||||
strip_prefix = "libffi-3.3-rc2",
|
||||
urls = ["https://github.com/libffi/libffi/releases/download/v3.3-rc2/libffi-3.3-rc2.tar.gz"],
|
||||
)
|
||||
|
||||
# libunwind
|
||||
|
|
@ -113,7 +114,7 @@ def sapi_deps():
|
|||
"--disable-shared",
|
||||
"--enable-ptrace",
|
||||
],
|
||||
sha256 = "3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb",
|
||||
sha256 = "3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb", # 2017-06-15
|
||||
strip_prefix = "libunwind-1.2.1",
|
||||
urls = ["https://github.com/libunwind/libunwind/releases/download/v1.2.1/libunwind-1.2.1.tar.gz"], # v1.2.1
|
||||
urls = ["https://github.com/libunwind/libunwind/releases/download/v1.2.1/libunwind-1.2.1.tar.gz"],
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user