Separate windows patches

Signed-off-by: Anuraag Agrawal <anuraaga@gmail.com>

Author: anuraaga

bazel/com_google_protoconverter.patch

@@ -1,32 +1,3 @@
-diff --git a/build_defs/BUILD.bazel b/build_defs/BUILD.bazel
-index 732514d..a6be18b 100644
---- a/build_defs/BUILD.bazel
-+++ b/build_defs/BUILD.bazel
-@@ -13,10 +13,23 @@ package(
- )
- 
- create_compiler_config_setting(
--    name = "config_msvc",
-+    name = "config_msvc_cl",
-     value = "msvc-cl",
- )
- 
-+create_compiler_config_setting(
-+    name = "config_clang_cl",
-+    value = "clang-cl",
-+)
-+
-+selects.config_setting_group(
-+    name = "config_msvc",
-+    match_any = [
-+        ":config_clang_cl",
-+        ":config_msvc_cl",
-+    ],
-+)
-+
- config_setting(
-     name = "aarch64",
-     values = {"cpu": "linux-aarch_64"},
 diff --git a/src/google/protobuf/stubs/BUILD.bazel b/src/google/protobuf/stubs/BUILD.bazel
 index a7b8c82..4f66827 100644
 --- a/src/google/protobuf/stubs/BUILD.bazel

bazel/com_google_protoconverter_win.patch

@@ -0,0 +1,29 @@
+diff --git a/build_defs/BUILD.bazel b/build_defs/BUILD.bazel
+index 732514d..a6be18b 100644
+--- a/build_defs/BUILD.bazel
++++ b/build_defs/BUILD.bazel
+@@ -13,10 +13,23 @@ package(
+ )
+ 
+ create_compiler_config_setting(
+-    name = "config_msvc",
++    name = "config_msvc_cl",
+     value = "msvc-cl",
+ )
+ 
++create_compiler_config_setting(
++    name = "config_clang_cl",
++    value = "clang-cl",
++)
++
++selects.config_setting_group(
++    name = "config_msvc",
++    match_any = [
++        ":config_clang_cl",
++        ":config_msvc_cl",
++    ],
++)
++
+ config_setting(
+     name = "aarch64",
+     values = {"cpu": "linux-aarch_64"},

bazel/foreign_cc/BUILD

@@ -41,6 +41,7 @@ configure_make(
         "skip_on_windows",
     ],
     targets = ["install"],
+    target_compatible_with = ["@platforms//os:linux"],
 )
 
 envoy_cc_library(
@@ -461,6 +462,7 @@ configure_make(
         "//bazel:windows_x86_64": ["libdl.a"],
         "//conditions:default": [],
     }),
+    target_compatible_with = ["@platforms//os:windows"],
 )
 
 cc_library(

bazel/foreign_cc/cel-cpp.patch

@@ -1,15 +1,3 @@
-diff --git a/bazel/cel_proto_transitive_descriptor_set.bzl b/bazel/cel_proto_transitive_descriptor_set.bzl
-index e65e0b4a..18837236 100644
---- a/bazel/cel_proto_transitive_descriptor_set.bzl
-+++ b/bazel/cel_proto_transitive_descriptor_set.bzl
-@@ -30,6 +30,7 @@ def _cel_proto_transitive_descriptor_set(ctx):
-         progress_message = "Joining descriptors.",
-         command = ("< \"$1\" xargs cat >{output}".format(output = output.path)),
-         arguments = [args],
-+        use_default_shell_env = True,
-     )
-     return DefaultInfo(
-         files = depset([output]),
 diff --git a/common/internal/byte_string.cc b/common/internal/byte_string.cc
 index b9f47922..9d096424 100644
 --- a/common/internal/byte_string.cc

bazel/foreign_cc/luajit.patch

@@ -53,7 +53,7 @@ index c83abfa0..0276f9e3 100644
  ##############################################################################
 diff --git a/luajit_build.sh b/luajit_build.sh
 new file mode 100755
-index 00000000..8dca96e6
+index 00000000..3b4f8eca
 --- /dev/null
 +++ b/luajit_build.sh
 @@ -0,0 +1,68 @@
@@ -125,47 +125,3 @@ index 00000000..8dca96e6
 +"${MAKE:-make}" -j$(nproc) V=1 PREFIX="$PREFIX" \
 +  "${EXTRA_MAKE_ARGS[@]}" \
 +  install
-diff --git a/luajit_build_win.sh b/luajit_build_win.sh
-new file mode 100755
-index 00000000..a493e7e0
---- /dev/null
-+++ b/luajit_build_win.sh
-@@ -0,0 +1,38 @@
-+#!/bin/bash
-+
-+set -e
-+
-+PREFIX=""
-+while [[ $# -gt 0 ]]; do
-+    case $1 in
-+        --prefix=*)
-+            PREFIX="${1#*=}"
-+            shift
-+            ;;
-+        --prefix)
-+            PREFIX="$2"
-+            shift 2
-+            ;;
-+        *)
-+            shift
-+            ;;
-+    esac
-+done
-+
-+# Copy source tree to a build directory
-+SRC_DIR="$(dirname "$(realpath "$0")")"
-+BUILD_DIR="$(basename "$SRC_DIR")"
-+cp -r "$SRC_DIR" "$BUILD_DIR"
-+cd "$BUILD_DIR"
-+
-+cd src
-+./msvcbuild.bat static
-+
-+mkdir -p "$PREFIX/lib"
-+cp lua51.lib vc140.pdb "$PREFIX/lib"
-+mkdir -p "$PREFIX/include/luajit-2.1"
-+for header in lauxlib.h luaconf.h lua.h lua.hpp luajit.h lualib.h; do
-+    cp "$header" "$PREFIX/include/luajit-2.1"
-+done
-+mkdir -p "$PREFIX/bin"
-+cp luajit.exe "$PREFIX/bin"

bazel/foreign_cc/luajit_win.patch

@@ -0,0 +1,44 @@
+diff --git a/luajit_build_win.sh b/luajit_build_win.sh
+new file mode 100755
+index 00000000..a493e7e0
+--- /dev/null
++++ b/luajit_build_win.sh
+@@ -0,0 +1,38 @@
++#!/bin/bash
++
++set -e
++
++PREFIX=""
++while [[ $# -gt 0 ]]; do
++    case $1 in
++        --prefix=*)
++            PREFIX="${1#*=}"
++            shift
++            ;;
++        --prefix)
++            PREFIX="$2"
++            shift 2
++            ;;
++        *)
++            shift
++            ;;
++    esac
++done
++
++# Copy source tree to a build directory
++SRC_DIR="$(dirname "$(realpath "$0")")"
++BUILD_DIR="$(basename "$SRC_DIR")"
++cp -r "$SRC_DIR" "$BUILD_DIR"
++cd "$BUILD_DIR"
++
++cd src
++./msvcbuild.bat static
++
++mkdir -p "$PREFIX/lib"
++cp lua51.lib vc140.pdb "$PREFIX/lib"
++mkdir -p "$PREFIX/include/luajit-2.1"
++for header in lauxlib.h luaconf.h lua.h lua.hpp luajit.h lualib.h; do
++    cp "$header" "$PREFIX/include/luajit-2.1"
++done
++mkdir -p "$PREFIX/bin"
++cp luajit.exe "$PREFIX/bin"

bazel/repositories.bzl

@@ -83,7 +83,10 @@ def _cc_deps():
     external_http_archive(
         name = "com_google_protoconverter",
         patch_args = ["-p1"],
-        patches = ["@envoy//bazel:com_google_protoconverter.patch"],
+        patches = [
+            "@envoy//bazel:com_google_protoconverter.patch",
+            "@envoy//bazel:com_google_protoconverter_win.patch",
+        ],
         patch_cmds = [
             "rm src/google/protobuf/stubs/common.cc",
             "rm src/google/protobuf/stubs/common.h",
@@ -808,7 +811,10 @@ def _com_github_luajit_luajit():
     external_http_archive(
         name = "com_github_luajit_luajit",
         build_file_content = BUILD_ALL_CONTENT,
-        patches = ["@envoy//bazel/foreign_cc:luajit.patch"],
+        patches = [
+            "@envoy//bazel/foreign_cc:luajit.patch",
+            "@envoy//bazel/foreign_cc:luajit_win.patch",
+        ],
         patch_args = ["-p1"],
     )