Rebase patches by @xhochy for v5.0.0

conda-forge · Feb 14, 2022 · f06f524 · f06f524
1 parent 2d3deb1
commit f06f524
Show file tree

Hide file tree

Showing 11 changed files with 266 additions and 133 deletions.
diff --git a/recipe/0001-Parametrize-LIBPROTOBUF_VERSION.patch b/recipe/0001-Parametrize-LIBPROTOBUF_VERSION.patch
@@ -1,17 +1,18 @@
-From 6c0c86eb969151e788c91a613425518f53beed5a Mon Sep 17 00:00:00 2001
+From ae064821c75245f30e4aba7f27c57bdabdd7cdef Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Thu, 28 Oct 2021 11:28:13 +0200
 Subject: [PATCH] Parametrize LIBPROTOBUF_VERSION
 
 ---
- WORKSPACE | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
+ WORKSPACE        |  4 ++--
+ distdir_deps.bzl | 10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/WORKSPACE b/WORKSPACE
-index 39f6ea9..865ba8a 100755
+index 06ba4ce28b..2763c67dab 100644
 --- a/WORKSPACE
 +++ b/WORKSPACE
-@@ -122,8 +122,8 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
+@@ -124,8 +124,8 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
  # TODO: Use installed protobuf version
  maven_install(
      artifacts = [
@@ -22,68 +23,31 @@ index 39f6ea9..865ba8a 100755
      ],
      repositories = [
          "https://repo1.maven.org/maven2",
-@@ -195,7 +195,7 @@ distdir_tar(
-         # bazelbuild/rules_proto
-         "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
-         # protocolbuffers/protobuf
--        "v3.13.0.tar.gz",
-+        "vLIBPROTOBUF_VERSION.tar.gz",
-         # grpc/grpc
-         "v1.33.1.tar.gz",
-         # c-ares/c-ares
-@@ -236,7 +236,7 @@ distdir_tar(
-         # bazelbuild/rules_proto
-         "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da",
-         # protocolbuffers/protobuf
--        "v3.13.0.tar.gz": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
-+        "vLIBPROTOBUF_VERSION.tar.gz": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
-         # grpc/grpc
-         "v1.33.1.tar.gz": "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63",
-         # c-ares/c-ares
-@@ -316,9 +316,9 @@ distdir_tar(
-             "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
-         ],
-         # protocolbuffers/protobuf
--        "v3.13.0.tar.gz": [
--            "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
--            "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
-+        "vLIBPROTOBUF_VERSION.tar.gz": [
-+            "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/vLIBPROTOBUF_VERSION.tar.gz",
-+            "https://github.com/protocolbuffers/protobuf/archive/vLIBPROTOBUF_VERSION.tar.gz",
-         ],
-         # grpc/grpc
-         "v1.33.1.tar.gz": [
-@@ -613,7 +613,7 @@ distdir_tar(
-         # bazelbuild/rules_proto
-         "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
-         # protocolbuffers/protobuf
--        "v3.13.0.tar.gz",
-+        "vLIBPROTOBUF_VERSION.tar.gz",
-         # grpc/grpc
-         "v1.33.1.tar.gz",
-         # c-ares/c-ares
-@@ -648,7 +648,7 @@ distdir_tar(
-         # bazelbuild/rules_proto
-         "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da",
-         # protocolbuffers/protobuf
--        "v3.13.0.tar.gz": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
-+        "vLIBPROTOBUF_VERSION.tar.gz": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
-         # grpc/grpc
-         "v1.33.1.tar.gz": "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63",
-         # c-ares/c-ares
-@@ -699,9 +699,9 @@ distdir_tar(
-             "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
-         ],
-         # protocolbuffers/protobuf
--        "v3.13.0.tar.gz": [
+diff --git a/distdir_deps.bzl b/distdir_deps.bzl
+index b872a69b50..899e31f06c 100644
+--- a/distdir_deps.bzl
++++ b/distdir_deps.bzl
+@@ -93,15 +93,15 @@ DIST_DEPS = {
+     #
+     #################################################
+     "com_google_protobuf": {
+-        "archive": "v3.13.0.tar.gz",
++        "archive": "vLIBPROTOBUF_VERSION.tar.gz",
+         "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
+-        "strip_prefix": "protobuf-3.13.0",
++        "strip_prefix": "protobuf-LIBPROTOBUF_VERSION",
+         "urls": [
 -            "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
 -            "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
-+        "vLIBPROTOBUF_VERSION.tar.gz": [
 +            "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/vLIBPROTOBUF_VERSION.tar.gz",
 +            "https://github.com/protocolbuffers/protobuf/archive/vLIBPROTOBUF_VERSION.tar.gz",
          ],
-         # grpc/grpc
-         "v1.33.1.tar.gz": [
+         "patch_args": ["-p1"],
+-        "patches": ["//third_party/protobuf:3.13.0.patch"],
++        "patches": ["//third_party/protobuf:LIBPROTOBUF_VERSION.patch"],
+         "used_in": [
+             "additional_distfiles",
+             "test_WORKSPACE_files",
 -- 
-2.30.1 (Apple Git-130)
+2.35.0
 
diff --git a/recipe/0001-allow-args-to-be-passed-to-bazel_build.patch b/recipe/0001-allow-args-to-be-passed-to-bazel_build.patch
@@ -1,7 +1,7 @@
-From 009c53452eb8024f11dd5f8de7066bbe56f0da44 Mon Sep 17 00:00:00 2001
+From 38da29f715dacbda32dd912cfa546315ff72a53f Mon Sep 17 00:00:00 2001
 From: Jonathan Helmus <jjhelmus@gmail.com>
 Date: Fri, 16 Mar 2018 12:10:51 -0500
-Subject: [PATCH 1/2] allow args to be passed to bazel_build
+Subject: [PATCH] allow args to be passed to bazel_build
 
 Allow arguments to be passed to bazel_build via the BAZEL_BUILD_OPTS
 environment variable.
@@ -23,5 +23,5 @@ index d91583d277..ce49a1266e 100755
    --host_platform=@local_config_platform//:host \
    --platforms=@local_config_platform//:host \
 -- 
-2.20.1
+2.35.0
 
diff --git a/recipe/0003-Build-with-native-dependencies.patch b/recipe/0003-Build-with-native-dependencies.patch
@@ -1,39 +1,33 @@
-From 24fba481c5a6dcb951c02e2f477a88eec86f9d1b Mon Sep 17 00:00:00 2001
+From 1f691c2c9b66331d1c804fca82f11c5f88449322 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwelk@xhochy.com>
 Date: Sun, 21 Mar 2021 21:26:54 +0100
-Subject: [PATCH] Build with native dependencies
+Subject: [PATCH 3/3] Build with native dependencies
 
 ---
- WORKSPACE                             |  43 ++-
- src/BUILD                             |  29 +-
- third_party/grpc/BUILD                |  37 +--
- third_party/ijar/BUILD                |  17 +-
- third_party/systemlibs/protobuf.BUILD | 141 +++++++++
- third_party/systemlibs/protobuf.bzl   | 436 ++++++++++++++++++++++++++
- 6 files changed, 659 insertions(+), 44 deletions(-)
+ WORKSPACE                                     |  37 +-
+ .../java/com/google/devtools/build/lib/BUILD  |   2 +-
+ .../java/com/google/devtools/build/lib/BUILD  |   2 +-
+ third_party/grpc/BUILD                        |  23 +-
+ third_party/grpc/grpc_1.41.0.patch            |  27 +-
+ third_party/systemlibs/protobuf.BUILD         | 141 ++++++
+ third_party/systemlibs/protobuf.bzl           | 436 ++++++++++++++++++
+ 7 files changed, 638 insertions(+), 30 deletions(-)
  create mode 100644 third_party/systemlibs/protobuf.BUILD
  create mode 100644 third_party/systemlibs/protobuf.bzl
 
 diff --git a/WORKSPACE b/WORKSPACE
-index 0878e18507..fcbe9c6336 100644
+index 464a7a6f5a..06ba4ce28b 100644
 --- a/WORKSPACE
 +++ b/WORKSPACE
-@@ -93,17 +93,40 @@ bind(
+@@ -95,10 +95,41 @@ bind(
      actual = "@bazel_tools//tools/objc:xcrunwrapper",
  )
 
--http_archive(
+-dist_http_archive(
 +new_local_repository(
      name = "com_google_protobuf",
--    patch_args = ["-p1"],
 -    patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
 -    patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
--    patches = ["//third_party/protobuf:3.13.0.patch"],
--    sha256 = "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
--    strip_prefix = "protobuf-3.13.0",
--    urls = [
--        "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
--        "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
 +    path = "./third_party/systemlibs",
 +    build_file = "./third_party/systemlibs/protobuf.BUILD",
 +)
@@ -66,17 +60,44 @@ index 0878e18507..fcbe9c6336 100644
 +    ],
 +    repositories = [
 +        "https://repo1.maven.org/maven2",
++    ],
+ )
+
+ # This is a mock version of bazelbuild/rules_python that contains only
+diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
+index ccf94ebeb3..2ed36113ea 100644
+--- a/src/main/java/com/google/devtools/build/lib/BUILD
++++ b/src/main/java/com/google/devtools/build/lib/BUILD
+@@ -371,7 +371,7 @@ java_library(
+         "//third_party:guava",
+         "//third_party:jsr305",
+         "@com_google_protobuf//:protobuf_java",
+-        "@com_google_protobuf//java/util",
++        "@com_google_protobuf//:protobuf_java_util",
      ],
  )
 
+diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
+index aa68080cb9..3b25194d0c 100644
+--- a/src/test/java/com/google/devtools/build/lib/BUILD
++++ b/src/test/java/com/google/devtools/build/lib/BUILD
+@@ -198,7 +198,7 @@ java_test(
+         "//third_party:mockito",
+         "//third_party:truth",
+         "//third_party/protobuf:protobuf_java",
+-        "@com_google_protobuf//java/util",
++        "@com_google_protobuf:protobuf_java_util",
+         "@com_google_testparameterinjector//:testparameterinjector",
+     ],
+ )
 diff --git a/third_party/grpc/BUILD b/third_party/grpc/BUILD
-index 3bd85ba6b3..8c5ba7605e 100644
+index 00d1533b85..ce1e9715ac 100644
 --- a/third_party/grpc/BUILD
 +++ b/third_party/grpc/BUILD
-@@ -70,28 +70,23 @@ distrib_cc_binary(
+@@ -73,28 +73,23 @@ distrib_cc_binary(
      deps = ["//third_party/protobuf:protoc_lib"],
  )
-
+ 
 -alias(
 +genrule(
      name = "cpp_plugin",
@@ -89,7 +110,7 @@ index 3bd85ba6b3..8c5ba7605e 100644
 +    executable = 1,
 +    visibility = ["//visibility:public"],
  )
-
+ 
  alias(
      name = "grpc++_codegen_proto",
 -    actual = select({
@@ -98,7 +119,7 @@ index 3bd85ba6b3..8c5ba7605e 100644
 -    }),
 +    actual = "grpc++_unsecure",
  )
-
+ 
 -alias(
 +cc_library(
      name = "grpc++_unsecure",
@@ -109,8 +130,84 @@ index 3bd85ba6b3..8c5ba7605e 100644
 +    linkopts = ["-lgrpc++_unsecure", "-lgrpc_unsecure","-lgpr"],
 +    visibility = ["//visibility:public"],
  )
-
+ 
  filegroup(
+diff --git a/third_party/grpc/grpc_1.41.0.patch b/third_party/grpc/grpc_1.41.0.patch
+index 660551b5d1..5939d31825 100644
+--- a/third_party/grpc/grpc_1.41.0.patch
++++ b/third_party/grpc/grpc_1.41.0.patch
+@@ -9,10 +9,10 @@ Date:   Wed Jun 3 15:35:31 2020 +0200
+     - Redirect zlib to @//third_party/zlib
+
+ diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl
+-index 7bb6b8bdb9..7644107b70 100644
++index ddfb8e36e7..086ebe34b6 100644
+ --- a/bazel/grpc_build_system.bzl
+ +++ b/bazel/grpc_build_system.bzl
+-@@ -25,7 +25,7 @@
++@@ -26,7 +26,7 @@
+  load("//bazel:cc_grpc_library.bzl", "cc_grpc_library")
+  load("//bazel:copts.bzl", "GRPC_DEFAULT_COPTS")
+  load("@upb//bazel:upb_proto_library.bzl", "upb_proto_library")
+@@ -21,7 +21,7 @@ index 7bb6b8bdb9..7644107b70 100644
+
+  # The set of pollers to test against if a test exercises polling
+  POLLERS = ["epollex", "epoll1", "poll"]
+-@@ -181,13 +181,13 @@ def ios_cc_test(
++@@ -211,13 +211,13 @@ def ios_cc_test(
+              testonly = 1,
+          )
+          ios_test_deps = [ios_test_adapter, ":" + test_lib_ios]
+@@ -39,14 +39,14 @@ index 7bb6b8bdb9..7644107b70 100644
+ +        #     minimum_os_version = "9.0",
+ +        #     deps = ios_test_deps,
+ +        # )
+-
++ 
+  def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data = [], uses_polling = True, language = "C++", size = "medium", timeout = None, tags = [], exec_compatible_with = [], exec_properties = {}, shard_count = None, flaky = None, copts = []):
+      copts = copts + if_mac(["-DGRPC_CFSTREAM"])
+ diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
+-index 09fcad95a2..9b737e5deb 100644
++index e2ef402ab3..db0b6e0610 100644
+ --- a/bazel/grpc_deps.bzl
+ +++ b/bazel/grpc_deps.bzl
+-@@ -33,7 +33,7 @@ def grpc_deps():
++@@ -81,7 +81,7 @@ def grpc_deps():
+
+      native.bind(
+          name = "madler_zlib",
+@@ -56,12 +56,14 @@ index 09fcad95a2..9b737e5deb 100644
+
+      native.bind(
+ diff --git a/bazel/grpc_extra_deps.bzl b/bazel/grpc_extra_deps.bzl
+-index 09fcad95a2..9b737e5deb 100644
++index ec171927eb..24e4eeb935 100644
+ --- a/bazel/grpc_extra_deps.bzl
+ +++ b/bazel/grpc_extra_deps.bzl
+-@@ -15,11 +15,6 @@
++@@ -13,13 +13,7 @@
++ # limitations under the License.
++ """Loads the dependencies necessary for the external repositories defined in grpc_deps.bzl."""
+
+- load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
++-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+  load("@upb//bazel:workspace_deps.bzl", "upb_deps")
+ -load("@envoy_api//bazel:repositories.bzl", "api_dependencies")
+ -load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
+@@ -71,8 +73,11 @@ index 09fcad95a2..9b737e5deb 100644
+
+  def grpc_extra_deps(ignore_version_differences = False):
+      """Loads the extra dependencies.
+-@@ -43,20 +38,3 @@
+-     protobuf_deps()
++@@ -40,23 +34,5 @@ def grpc_extra_deps(ignore_version_differences = False):
++     grpc_extra_deps()
++     ```
++     """
++-    protobuf_deps()
+
+      upb_deps()
+ -
 diff --git a/third_party/systemlibs/protobuf.BUILD b/third_party/systemlibs/protobuf.BUILD
 new file mode 100644
 index 0000000000..3e42a1bf31
@@ -701,5 +798,5 @@ index 0000000000..8b3a16e7cf
 +    if current.compare_to(expected) < 0:
 +        fail("Bazel must be newer than 0.5.4")
 -- 
-2.24.3 (Apple Git-128)
+2.33.1
 
diff --git a/recipe/0004-zipper-from-conda-package.patch b/recipe/0004-zipper-from-conda-package.patch
@@ -1,5 +1,17 @@
---- third_party/ijar/BUILD
-+++ third_party/ijar/BUILD
+From f020c75a099c067695c8a12ea59a53ec60228f98 Mon Sep 17 00:00:00 2001
+From: "Uwe L. Korn" <uwe.korn@quantco.com>
+Date: Sun, 13 Feb 2022 17:17:26 -0500
+Subject: [PATCH 4/4] zipper from conda package
+
+---
+ third_party/ijar/BUILD | 17 ++++++++---------
+ tools/zip/BUILD.tools  | 13 +++++++++----
+ 2 files changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/third_party/ijar/BUILD b/third_party/ijar/BUILD
+index 28f05bf443..412b538dd3 100644
+--- a/third_party/ijar/BUILD
++++ b/third_party/ijar/BUILD
 @@ -69,21 +69,20 @@ cc_library(
      ],
  )
@@ -30,8 +42,10 @@
  )
 
  filegroup(
---- tools/zip/BUILD.tools	2021-03-22 20:12:49.000000000 +0100
-+++ tools/zip/BUILD.tools	2021-03-22 20:13:03.000000000 +0100
+diff --git a/tools/zip/BUILD.tools b/tools/zip/BUILD.tools
+index c2dd86ee17..5d8085e1fb 100644
+--- a/tools/zip/BUILD.tools
++++ b/tools/zip/BUILD.tools
 @@ -1,9 +1,14 @@
  package(default_visibility = ["//visibility:public"])
 
@@ -48,6 +62,9 @@
 -    srcs = select({
 -        "//src/conditions:remote": ["//third_party/ijar:zipper"],
 -        "//conditions:default": glob(["zipper/*"]),
--   }),
+-    }),
 +    srcs = [":zipper-exec"],
  )
+-- 
+2.35.0
+