Merge branch 'main' into meson-ldflags

Author: matt-sm

.github/workflows/release_prep.sh

@@ -8,10 +8,10 @@ TAG=${GITHUB_REF_NAME}
 # The prefix is chosen to match what GitHub generates for source archives
 PREFIX="rules_foreign_cc-${TAG}"
 ARCHIVE="rules_foreign_cc-$TAG.tar.gz"
-git archive --format=tar --prefix="${PREFIX}"/ "${TAG}" | gzip > "$ARCHIVE"
+git archive --format=tar --prefix="${PREFIX}"/ "${TAG}" | gzip >"$ARCHIVE"
 SHA="$(shasum -a 256 "$ARCHIVE" | awk '{print $1}')"
 
-cat << EOF
+cat <<EOF
 ## Using Bzlmod
 
 1. Enable with \`common --enable_bzlmod\` in \`.bazelrc\`.
@@ -55,6 +55,10 @@ load("@rules_python//python:repositories.bzl", "py_repositories")
 
 py_repositories()
 
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
 EOF
 
 # TODO: add example of how to configure for bzlmod

MODULE.bazel

@@ -26,23 +26,23 @@ use_repo(python, "python_3_12")
 tools = use_extension("@rules_foreign_cc//foreign_cc:extensions.bzl", "tools")
 use_repo(
     tools,
-    "cmake_3.31.7_toolchains",
+    "cmake_3.31.8_toolchains",
     "cmake_src",
     "gettext_runtime",
     "glib_dev",
     "glib_src",
     "gnumake_src",
     "meson_src",
-    "ninja_1.12.1_toolchains",
+    "ninja_1.13.0_toolchains",
     "ninja_build_src",
     "pkgconfig_src",
     "rules_foreign_cc_framework_toolchains",
 )
 
 register_toolchains(
     "@rules_foreign_cc_framework_toolchains//:all",
-    "@cmake_3.31.7_toolchains//:all",
-    "@ninja_1.12.1_toolchains//:all",
+    "@cmake_3.31.8_toolchains//:all",
+    "@ninja_1.13.0_toolchains//:all",
     "@python_3_12//:all",
     "@rules_foreign_cc//toolchains:all",
 )

foreign_cc/built_tools/make_build.bzl

@@ -81,6 +81,15 @@ def _make_tool_impl(ctx):
         if os_name(ctx) == "macos":
             non_sysroot_ldflags += ["-undefined", "error"]
 
+            # On macOS, remove "-lm".
+            # During compilation, the ./configure script disables USE_SYSTEM_GLOB,
+            # and chooses its own glob implementation (lib/glob.h, lib/glob.c).
+            # all source files in lib/* are compiled to ./lib/libgnu.a
+            # However, at link time, "-lm" appears before "-lgnu".
+            # This linker commandline is like this: LINKER ... -lm -L./lib -o xxx ... -lgnu
+            # So the system glob is linked instead, causing ABI conflicts.
+            non_sysroot_ldflags = [x for x in non_sysroot_ldflags if x != "-lm"]
+
         configure_options = [
             "--without-guile",
             "--with-guile=no",

foreign_cc/extensions.bzl

@@ -4,8 +4,8 @@ load("@bazel_features//:features.bzl", "bazel_features")
 load("//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
 load("//toolchains:prebuilt_toolchains.bzl", "prebuilt_toolchains")
 
-_DEFAULT_CMAKE_VERSION = "3.31.7"
-_DEFAULT_NINJA_VERSION = "1.12.1"
+_DEFAULT_CMAKE_VERSION = "3.31.8"
+_DEFAULT_NINJA_VERSION = "1.13.0"
 
 cmake_toolchain_version = tag_class(attrs = {
     "version": attr.string(doc = "The cmake version", default = _DEFAULT_CMAKE_VERSION),

foreign_cc/private/framework/toolchains/macos_commands.bzl

@@ -261,7 +261,7 @@ def replace_symlink(file):
     # as `readlink` is.
     return """\
 if [[ -L "{file}" ]]; then
-  target="$(python3 -c "import os; print(os.path.realpath('{file}'))")"
+  target="$(realpath '{file}')"
   rm "{file}" && cp -a "${{target}}" "{file}"
 fi
 """.format(file = file)

foreign_cc/repositories.bzl

@@ -9,9 +9,9 @@ load("//toolchains:toolchains.bzl", "built_toolchains", "prebuilt_toolchains", "
 def rules_foreign_cc_dependencies(
         native_tools_toolchains = [],
         register_default_tools = True,
-        cmake_version = "3.31.7",
+        cmake_version = "3.31.8",
         make_version = "4.4.1",
-        ninja_version = "1.12.1",
+        ninja_version = "1.13.0",
         meson_version = "1.5.1",
         pkgconfig_version = "0.29.2",
         register_preinstalled_tools = True,

toolchains/built_toolchains.bzl

@@ -131,6 +131,19 @@ def _ninja_toolchain(version, register_toolchains):
         native.register_toolchains(
             "@rules_foreign_cc//toolchains:built_ninja_toolchain",
         )
+    if version == "1.13.0":
+        maybe(
+            http_archive,
+            name = "ninja_build_src",
+            build_file_content = _ALL_CONTENT,
+            integrity = "sha256-8IZB0ACZqeQNROwBRvhBxHKuWLfm3VF77jlFz9kjzt8=",
+            strip_prefix = "ninja-1.13.0",
+            urls = [
+                "https://mirror.bazel.build/github.com/ninja-build/ninja/archive/v1.13.0.tar.gz",
+                "https://github.com/ninja-build/ninja/archive/v1.13.0.tar.gz",
+            ],
+        )
+        return
     if version == "1.12.1":
         maybe(
             http_archive,

toolchains/cmake_versions.bzl

@@ -629,6 +629,13 @@ CMAKE_SRCS = {
         "cmake-3.30.8",
         "10434223a40531b4d6bd77f8ffc471f1714029f4e6d2c83c499187a940276720",
     ],
+    "3.30.9": [
+        [
+            "https://github.com/Kitware/CMake/releases/download/v3.30.9/cmake-3.30.9.tar.gz",
+        ],
+        "cmake-3.30.9",
+        "65f765bb87c8019316cabe67cbe5e8f45ede334eeb5afd161ca6874d17994e0d",
+    ],
     "3.31.0": [
         [
             "https://github.com/Kitware/CMake/releases/download/v3.31.0/cmake-3.31.0.tar.gz",
@@ -685,6 +692,13 @@ CMAKE_SRCS = {
         "cmake-3.31.7",
         "a6d2eb1ebeb99130dfe63ef5a340c3fdb11431cce3d7ca148524c125924cea68",
     ],
+    "3.31.8": [
+        [
+            "https://github.com/Kitware/CMake/releases/download/v3.31.8/cmake-3.31.8.tar.gz",
+        ],
+        "cmake-3.31.8",
+        "e3cde3ca83dc2d3212105326b8f1b565116be808394384007e7ef1c253af6caa",
+    ],
     "4.0.0": [
         [
             "https://github.com/Kitware/CMake/releases/download/v4.0.0/cmake-4.0.0.tar.gz",
@@ -706,4 +720,11 @@ CMAKE_SRCS = {
         "cmake-4.0.2",
         "1c3a82c8ca7cf12e0b17178f9d0c32f7ac773bd5651a98fcfd80fbf4977f8d48",
     ],
+    "4.0.3": [
+        [
+            "https://github.com/Kitware/CMake/releases/download/v4.0.3/cmake-4.0.3.tar.gz",
+        ],
+        "cmake-4.0.3",
+        "8d3537b7b7732660ea247398f166be892fe6131d63cc291944b45b91279f3ffb",
+    ],
 }