From 24d212658128e983ee71c9261e79f9cacb3b83ef Mon Sep 17 00:00:00 2001 From: Ricky Stewart Date: Mon, 15 Jul 2024 22:09:29 +0000 Subject: [PATCH] DEPS.bzl: update `rules_go` and enable assembly routines for zstd There was an issue with one of our patches to `rules_go` that was fixed in cockroachdb/rules_go#21. We pull in that change and additionally remove our patch that disabled the assembly routines. Closes: #105568 Epic: CRDB-17171 Release note: None --- DEPS.bzl | 4 ---- WORKSPACE | 8 ++++---- build/bazelutil/distdir_files.bzl | 2 +- build/patches/com_github_datadog_zstd.patch | 12 ------------ 4 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 build/patches/com_github_datadog_zstd.patch diff --git a/DEPS.bzl b/DEPS.bzl index 42793868e421..c62ab6062cba 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -2233,10 +2233,6 @@ def go_deps(): name = "com_github_datadog_zstd", build_file_proto_mode = "disable_global", importpath = "github.com/DataDog/zstd", - patch_args = ["-p1"], - patches = [ - "@com_github_cockroachdb_cockroach//build/patches:com_github_datadog_zstd.patch", - ], sha256 = "e4924158bd1abf765a016d2c728fc367b32d20b86a268ef25743ba404c55e097", strip_prefix = "github.com/DataDog/zstd@v1.5.6-0.20230824185856-869dae002e5e", urls = [ diff --git a/WORKSPACE b/WORKSPACE index 03f26dd38f89..96aa5953c633 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -8,12 +8,12 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # Load go bazel tools. This gives us access to the go bazel SDK/toolchains. http_archive( name = "io_bazel_rules_go", - sha256 = "c47bbf3fedda339cf41e9a17964bc76a404e4cb2f1213067cc42b453e8a2eb38", - strip_prefix = "cockroachdb-rules_go-0e7e4e3", + sha256 = "ada68324bc20ffd1b557bab4cf8dba9b742570a46a505b0bc99c1fde5132cce5", + strip_prefix = "cockroachdb-rules_go-734c37d", urls = [ - # cockroachdb/rules_go as of 0e7e4e31aa49f1afbb402fbb4895f38bc702c88c + # cockroachdb/rules_go as of 734c37d6e2e6570f420d27fd97424b2fe2b402af # (upstream release-0.46 plus a few patches). - "https://storage.googleapis.com/public-bazel-artifacts/bazel/cockroachdb-rules_go-v0.27.0-458-g0e7e4e3.tar.gz", + "https://storage.googleapis.com/public-bazel-artifacts/bazel/cockroachdb-rules_go-v0.27.0-459-g734c37d.tar.gz", ], ) diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index 5187349461f3..dfcd38da7eec 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -1182,7 +1182,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/public-bazel-artifacts/bazel/bmatcuk-doublestar-v4.0.1-0-gf7a8118.tar.gz": "d11c3b3a45574f89d6a6b2f50e53feea50df60407b35f36193bf5815d32c79d1", "https://storage.googleapis.com/public-bazel-artifacts/bazel/cockroachdb-protobuf-3f5d91f.tar.gz": "6d4e7fe1cbd958dee69ce9becbf8892d567f082b6782d3973a118d0aa00807a8", "https://storage.googleapis.com/public-bazel-artifacts/bazel/cockroachdb-rules_foreign_cc-8d34d77.tar.gz": "03afebfc3f173666a3820a29512265c710c3a08d0082ba77469779d3e3af5a11", - "https://storage.googleapis.com/public-bazel-artifacts/bazel/cockroachdb-rules_go-v0.27.0-458-g0e7e4e3.tar.gz": "c47bbf3fedda339cf41e9a17964bc76a404e4cb2f1213067cc42b453e8a2eb38", + "https://storage.googleapis.com/public-bazel-artifacts/bazel/cockroachdb-rules_go-v0.27.0-459-g734c37d.tar.gz": "ada68324bc20ffd1b557bab4cf8dba9b742570a46a505b0bc99c1fde5132cce5", "https://storage.googleapis.com/public-bazel-artifacts/bazel/google-starlark-go-e043a3d.tar.gz": "a35c6468e0e0921833a63290161ff903295eaaf5915200bbce272cbc8dfd1c1c", "https://storage.googleapis.com/public-bazel-artifacts/bazel/googleapis-83c3605afb5a39952bf0a0809875d41cf2a558ca.zip": "ba694861340e792fd31cb77274eacaf6e4ca8bda97707898f41d8bebfd8a4984", "https://storage.googleapis.com/public-bazel-artifacts/bazel/platforms-0.0.4.tar.gz": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", diff --git a/build/patches/com_github_datadog_zstd.patch b/build/patches/com_github_datadog_zstd.patch deleted file mode 100644 index 1ce535b0697f..000000000000 --- a/build/patches/com_github_datadog_zstd.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN a/BUILD.bazel b/BUILD.bazel ---- a/BUILD.bazel 1969-12-31 19:00:00.000000000 -0500 -+++ b/BUILD.bazel 2000-01-01 00:00:00.000000000 -0000 -@@ -98,7 +98,7 @@ - "zstdmt_compress.h", - ], - cgo = True, -- copts = ["-DZSTD_LEGACY_SUPPORT=4 -DZSTD_MULTITHREAD=1"], -+ copts = ["-DZSTD_LEGACY_SUPPORT=4 -DZSTD_MULTITHREAD=1 -DZSTD_DISABLE_ASM=1"], - importpath = "github.com/DataDog/zstd", - visibility = ["//visibility:public"], - )