Merge branch 'main' into macos-portable-cp

bazel-contrib · Aug 8, 2024 · 6d1b244 · 6d1b244
2 parents 98d6f73 + 35bf656
commit 6d1b244
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 110 deletions.
diff --git a/examples/third_party/BUILD.bazel b/examples/third_party/BUILD.bazel
@@ -86,7 +86,8 @@ test_suite(
         "//cares:test_c_ares",
         "//cares:test_c_ares_ios",
         "//curl:curl_test_suite",
-        "//glib:glib_build_test",
+        # Fails due to linker error in ffi (https://github.com/mesonbuild/meson/issues/12282)
+        # "//glib:glib_build_test",
         "//gn:gn_launch_test",
         "//gperftools:test",
         "//iconv:iconv_macos_build_test",
@@ -95,7 +96,8 @@ test_suite(
         "//libpng:test_libpng",
         "//libssh2:libssh2_build_test",
         "//log4cxx:log4cxx_build_test",
-        "//mesa:mesa_build_test",
+        # Fails due to linker argument error (https://github.com/mesonbuild/meson/issues/12282)
+        # "//mesa:mesa_build_test",
         "//openssl:openssl_test_suite",
         "//pcre:pcre_build_test",
         "//python:python_tests",

diff --git a/examples/third_party/apr/BUILD.apr.bazel b/examples/third_party/apr/BUILD.apr.bazel
@@ -50,6 +50,10 @@ configure_make(
     configure_options = [
         "--disable-shared",
     ],
+    configure_prefix = select({
+        "@platforms//os:macos": "CPPFLAGS=-DAPR_IOVEC_DEFINED ",
+        "//conditions:default": "",
+    }),
     env = select({
         "@platforms//os:macos": {"AR": ""},
         "//conditions:default": {},

diff --git a/examples/third_party/apr/apr_repositories.bzl b/examples/third_party/apr/apr_repositories.bzl
@@ -9,17 +9,16 @@ def apr_repositories():
         name = "apr",
         build_file = Label("//apr:BUILD.apr.bazel"),
         patches = [
-            # https://bz.apache.org/bugzilla/show_bug.cgi?id=50146
-            Label("//apr:macos_iovec.patch"),
             # https://bz.apache.org/bugzilla/show_bug.cgi?id=64753
             Label("//apr:macos_pid_t.patch"),
             # https://apachelounge.com/viewtopic.php?t=8260
             Label("//apr:windows_winnt.patch"),
         ],
-        sha256 = "48e9dbf45ae3fdc7b491259ffb6ccf7d63049ffacbc1c0977cced095e4c2d5a2",
-        strip_prefix = "apr-1.7.0",
+        sha256 = "",
+        strip_prefix = "apr-1.7.4",
         urls = [
-            "https://mirror.bazel.build/www-eu.apache.org/dist/apr/apr-1.7.0.tar.gz",
-            "https://www-eu.apache.org/dist/apr/apr-1.7.0.tar.gz",
+            "https://mirror.bazel.build/www-eu.apache.org/dist/apr/apr-1.7.4.tar.gz",
+            "https://dlcdn.apache.org/apr/apr-1.7.4.tar.gz",
+            "https://www-eu.apache.org/dist/apr/apr-1.7.4.tar.gz",
         ],
     )
diff --git a/examples/third_party/apr/macos_iovec.patch b/examples/third_party/apr/macos_iovec.patch
diff --git a/examples/third_party/bison/bison_repositories.bzl b/examples/third_party/bison/bison_repositories.bzl
@@ -9,10 +9,10 @@ def bison_repositories():
         http_archive,
         name = "bison",
         build_file = Label("//bison:BUILD.bison.bazel"),
-        strip_prefix = "bison-3.3",
+        strip_prefix = "bison-3.8.2",
         urls = [
-            "https://mirror.bazel.build/ftp.gnu.org/gnu/bison/bison-3.3.tar.gz",
-            "http://ftp.gnu.org/gnu/bison/bison-3.3.tar.gz",
+            "https://mirror.bazel.build/ftp.gnu.org/gnu/bison/bison-3.8.2.tar.gz",
+            "https://ftp.gnu.org/gnu/bison/bison-3.8.2.tar.gz",
         ],
-        sha256 = "fdeafb7fffade05604a61e66b8c040af4b2b5cbb1021dcfe498ed657ac970efd",
+        sha256 = "",
     )
diff --git a/foreign_cc/cmake.bzl b/foreign_cc/cmake.bzl
@@ -263,7 +263,7 @@ def _create_configure_script(configureParameters):
         install_prefix = "$$INSTALLDIR$$",
         root = root,
         no_toolchain_file = no_toolchain_file,
-        user_cache = expand_locations_and_make_variables(ctx, ctx.attr.cache_entries, "cache_entries", data),
+        user_cache = dict(ctx.attr.cache_entries),
         user_env = expand_locations_and_make_variables(ctx, ctx.attr.env, "env", data),
         options = attrs.generate_args,
         cmake_commands = cmake_commands,