From 591214b5f0be0ecb27eae0767123b426fca89e90 Mon Sep 17 00:00:00 2001 From: Jose Ulises Nino Rivera Date: Mon, 17 Jun 2019 16:48:54 -0700 Subject: [PATCH] bazel: update foreign_cc and delete ranlib patch (#110) Signed-off-by: Jose Nino jnino@lyft.com Description: bazel: update foreign_cc and delete ranlib patch Risk Level: med -- external deps might not build correctly. Testing: CI Fixes #38 Signed-off-by: JP Simard --- mobile/WORKSPACE | 14 ++++++++------ mobile/bazel/ranlib.patch | 10 ---------- 2 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 mobile/bazel/ranlib.patch diff --git a/mobile/WORKSPACE b/mobile/WORKSPACE index cafc118e30d7..6bd698572471 100644 --- a/mobile/WORKSPACE +++ b/mobile/WORKSPACE @@ -1,14 +1,16 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -# TODO remove once https://github.com/bazelbuild/rules_foreign_cc/pull/253 is resolved -# NOTE: this version should be kept up to date with https://github.com/lyft/envoy-edge-fork/blob/3573b07af1ab5c4cf687ced0f80e2ccc0a0b7ec2/bazel/repository_locations.bzl#L225-L230 until this is removed +# NOTE: this version should be kept up to date with Envoy upstream: +# https://github.com/envoyproxy/envoy/blob/master/bazel/repository_locations.bzl#L217 +# It currently diverges due to known issues with the android NDK and libevent. +# https://github.com/lyft/envoy-mobile/issues/116 http_archive( name = "rules_foreign_cc", - patches = ["//bazel:ranlib.patch"], - sha256 = "e1b67e1fda647c7713baac11752573bfd4c2d45ef09afb4d4de9eb9bd4e5ac76", - strip_prefix = "rules_foreign_cc-8648b0446092ef2a34d45b02c8dc4c35c3a8df79", - urls = ["https://github.com/bazelbuild/rules_foreign_cc/archive/8648b0446092ef2a34d45b02c8dc4c35c3a8df79.tar.gz"], + sha256 = "c95ef9c19b713fc25fc0851f81c486e0d55ab90ead67363958327c053d2b108b", + strip_prefix = "rules_foreign_cc-2b40a0098d4016f620c2ee4c10da0f46f5c90d57", + # 2019-06-17 + urls = ["https://github.com/bazelbuild/rules_foreign_cc/archive/2b40a0098d4016f620c2ee4c10da0f46f5c90d57.tar.gz"], ) load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies") diff --git a/mobile/bazel/ranlib.patch b/mobile/bazel/ranlib.patch deleted file mode 100644 index 6fd6aeb9f788..000000000000 --- a/mobile/bazel/ranlib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/build_defs/cmake_script.bzl -+++ tools/build_defs/cmake_script.bzl -@@ -91,6 +91,7 @@ _CMAKE_ENV_VARS_FOR_CROSSTOOL = { - _CMAKE_CACHE_ENTRIES_CROSSTOOL = { - "CMAKE_SYSTEM_NAME": struct(value = "CMAKE_SYSTEM_NAME", replace = True), - "CMAKE_AR": struct(value = "CMAKE_AR", replace = True), -+ "CMAKE_RANLIB": struct(value = "CMAKE_RANLIB", replace = True), - "CMAKE_CXX_LINK_EXECUTABLE": struct(value = "CMAKE_CXX_LINK_EXECUTABLE", replace = True), - "CMAKE_C_FLAGS": struct(value = "CMAKE_C_FLAGS_INIT", replace = False), - "CMAKE_CXX_FLAGS": struct(value = "CMAKE_CXX_FLAGS_INIT", replace = False),