deps: Bump rules_foreign_cc -> 0.13.0 (envoyproxy#37569)

Fix envoyproxy#37553 Signed-off-by: Ryan Northey <ryan@synca.io> Signed-off-by: dependency-envoy[bot] <148525496+dependency-envoy[bot]@users.noreply.github.com>
fredyw · Jan 7, 2025 · aecb67c · aecb67c
1 parent 34abaa4
commit aecb67c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/bazel/foreign_cc/BUILD b/bazel/foreign_cc/BUILD
@@ -281,24 +281,24 @@ envoy_cmake(
         "CURL_DISABLE_CRYPTO_AUTH": "on",
         # C-Ares.
         "ENABLE_ARES": "on",
-        "CARES_LIBRARY": "$EXT_BUILD_DEPS/ares",
-        "CARES_INCLUDE_DIR": "$EXT_BUILD_DEPS/ares/include",
+        "CARES_LIBRARY": "$$EXT_BUILD_DEPS/ares",
+        "CARES_INCLUDE_DIR": "$$EXT_BUILD_DEPS/ares/include",
         # SSL (via Envoy's SSL dependency) is disabled, curl's CMake uses
         # FindOpenSSL.cmake which fails at what looks like version parsing
         # (the libraries are found ok).
         "CURL_CA_PATH": "none",
         "CURL_USE_OPENSSL": "off",
-        "OPENSSL_ROOT_DIR": "$EXT_BUILD_DEPS",
+        "OPENSSL_ROOT_DIR": "$$EXT_BUILD_DEPS",
         # Avoid libidn2
         "USE_LIBIDN2": "off",
         # NGHTTP2.
         "USE_NGHTTP2": "on",
-        "NGHTTP2_LIBRARY": "$EXT_BUILD_DEPS/nghttp2",
-        "NGHTTP2_INCLUDE_DIR": "$EXT_BUILD_DEPS/nghttp2/include",
+        "NGHTTP2_LIBRARY": "$$EXT_BUILD_DEPS/nghttp2",
+        "NGHTTP2_INCLUDE_DIR": "$$EXT_BUILD_DEPS/nghttp2/include",
         # ZLIB.
         "CURL_ZLIB": "on",
-        "ZLIB_LIBRARY": "$EXT_BUILD_DEPS/zlib",
-        "ZLIB_INCLUDE_DIR": "$EXT_BUILD_DEPS/zlib/include",
+        "ZLIB_LIBRARY": "$$EXT_BUILD_DEPS/zlib",
+        "ZLIB_INCLUDE_DIR": "$$EXT_BUILD_DEPS/zlib/include",
         "CMAKE_CXX_COMPILER_FORCED": "on",
     },
     defines = ["CURL_STATICLIB"],

diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -1059,11 +1059,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "Rules for using foreign build systems in Bazel",
         project_desc = "Rules for using foreign build systems in Bazel",
         project_url = "https://github.com/bazelbuild/rules_foreign_cc",
-        version = "0.12.0",
-        sha256 = "a2e6fb56e649c1ee79703e99aa0c9d13c6cc53c8d7a0cbb8797ab2888bbc99a3",
+        version = "0.13.0",
+        sha256 = "8e5605dc2d16a4229cb8fbe398514b10528553ed4f5f7737b663fdd92f48e1c2",
         strip_prefix = "rules_foreign_cc-{version}",
         urls = ["https://github.com/bazelbuild/rules_foreign_cc/archive/{version}.tar.gz"],
-        release_date = "2024-08-14",
+        release_date = "2024-12-06",
         use_category = ["build", "dataplane_core", "controlplane"],
         license = "Apache-2.0",
         license_url = "https://github.com/bazelbuild/rules_foreign_cc/blob/{version}/LICENSE",

diff --git a/contrib/hyperscan/matching/input_matchers/source/BUILD b/contrib/hyperscan/matching/input_matchers/source/BUILD
@@ -19,14 +19,14 @@ envoy_cmake(
     name = "hyperscan",
     build_data = ["@org_boost//:header"],
     cache_entries = {
-        "BOOST_ROOT": "$EXT_BUILD_ROOT/external/org_boost",
+        "BOOST_ROOT": "$$EXT_BUILD_ROOT/external/org_boost",
         "BUILD_AVX512": "on",
         "BUILD_AVX512VBMI": "on",
         "BUILD_EXAMPLES": "off",
         "CMAKE_BUILD_TYPE": "Release",
         "CMAKE_INSTALL_LIBDIR": "lib",
         "FAT_RUNTIME": "on",
-        "RAGEL": "$$EXT_BUILD_DEPS$$/ragel/bin/ragel",
+        "RAGEL": "$$EXT_BUILD_DEPS/ragel/bin/ragel",
     },
     default_cache_entries = {},
     lib_source = "@io_hyperscan//:all",
@@ -42,7 +42,7 @@ envoy_cmake(
     name = "vectorscan",
     build_data = ["@org_boost//:header"],
     cache_entries = {
-        "BOOST_ROOT": "$EXT_BUILD_ROOT/external/org_boost",
+        "BOOST_ROOT": "$$EXT_BUILD_ROOT/external/org_boost",
         #        "BUILD_SVE2_BITPERM": "on",
         #        "BUILD_SVE2": "on",
         #        "BUILD_SVE": "on",
@@ -52,7 +52,7 @@ envoy_cmake(
         "CMAKE_INSTALL_LIBDIR": "lib",
         "FAT_RUNTIME": "off",
         "SQLITE_SKIP_CHECK": "on",
-        "RAGEL": "$$EXT_BUILD_DEPS$$/ragel/bin/ragel",
+        "RAGEL": "$$EXT_BUILD_DEPS/ragel/bin/ragel",
     },
     default_cache_entries = {},
     lib_source = "@io_vectorscan//:all",