From 18ed9ee31987007c072e560f7fdb77b17d2ee03c Mon Sep 17 00:00:00 2001 From: martin4861 Date: Tue, 14 Oct 2025 06:38:59 +0200 Subject: [PATCH 1/3] Use updated bullseye sysroot with fixed symlinks --- .bazelignore | 1 + MODULE.bazel.lock | 8 ++++++-- cc/repositories.bzl | 8 ++++---- 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 .bazelignore diff --git a/.bazelignore b/.bazelignore new file mode 100644 index 00000000..d838da98 --- /dev/null +++ b/.bazelignore @@ -0,0 +1 @@ +examples/ diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index b0d2be96..e239d5ed 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -145,8 +145,8 @@ "moduleExtensions": { "//cc:extensions.bzl%swift_cc_toolchain_extension": { "general": { - "bzlTransitiveDigest": "zDwq2yBSEJXdECtks4+trENu8MzrMfkm5FDsxbO1KrE=", - "usagesDigest": "/6dsoamEyMs6vTiy7icOYdSA1kgYfntwG63tqnGYYGA=", + "bzlTransitiveDigest": "BWY82rOuYIMqeZ3jAwqCb9P2j/nWnyo63U4JdPsZwBI=", + "usagesDigest": "YQG/gd9UENDVMR8NOS1Ca7KxFp6z0jBQwIKBCkhF9Sw=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -269,6 +269,10 @@ "attributes": { "sha256": "cfa444ecc4fcc858acc045e72403efd54dab734bdad4ddec30aad8826916a617", "build_file_content": "\nfilegroup(\n name = \"x86_64-sysroot\",\n srcs = glob([\"*/**\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_cmds": [ + "rm -f lib64/ld-linux-x86-64.so.2", + "ln -sf ../lib/x86_64-linux-gnu/ld-2.31.so lib64/ld-linux-x86-64.so.2" + ], "url": "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-sysroot-v3/debian_bullseye_x86_64_sysroot.tar.xz" } }, diff --git a/cc/repositories.bzl b/cc/repositories.bzl index 10b8ed4a..6a58e432 100644 --- a/cc/repositories.bzl +++ b/cc/repositories.bzl @@ -136,7 +136,7 @@ def aarch64_sysroot(): maybe( http_archive, name = "aarch64-sysroot", - sha256 = "4e4cbbed33e78602a5f038305514307a5bd9baa6f6330f433fa4dffb3e9e9ad1", + sha256 = "d4f19fe984cfc413d5e7041c44241f536b33b76a8b49569edbcfdc0d405d30ee", build_file_content = """ filegroup( name = "aarch64-sysroot", @@ -144,14 +144,14 @@ filegroup( visibility = ["//visibility:public"], ) """, - url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-sysroot-v3/debian_bullseye_aarch64_sysroot.tar.xz", + url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-sysroot-beta4/debian_bullseye_aarch64_sysroot.tar.xz", ) def x86_64_sysroot(): maybe( http_archive, name = "x86_64-sysroot", - sha256 = "cfa444ecc4fcc858acc045e72403efd54dab734bdad4ddec30aad8826916a617", + sha256 = "0b102b840f5d93072b8dd3049e7b231092e9d354b855c3beac46b4ecfd718916", build_file_content = """ filegroup( name = "x86_64-sysroot", @@ -159,7 +159,7 @@ filegroup( visibility = ["//visibility:public"], ) """, - url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-sysroot-v3/debian_bullseye_x86_64_sysroot.tar.xz", + url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-sysroot-beta4/debian_bullseye_x86_64_sysroot.tar.xz", ) def register_swift_cc_toolchains(): From 595c9f37fad30c974b0a2449cbfe98d9d08c60bc Mon Sep 17 00:00:00 2001 From: martin4861 Date: Mon, 27 Oct 2025 13:15:59 +0100 Subject: [PATCH 2/3] Use bullseye-sysroot-v4 --- MODULE.bazel.lock | 2 +- cc/repositories.bzl | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index e239d5ed..e925236e 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -348,7 +348,7 @@ "//cc/toolchains/yocto_generic:yocto_generic_extension.bzl%yocto_generic_extension": { "general": { "bzlTransitiveDigest": "Q4v/HN5Wh/W0JsPpeExQzSqIslfepuWsd75kvW+25FI=", - "usagesDigest": "nSI66VIQzuf2qIL6ZKsJd2f5KY34kHbBT6Wj3PGjtYA=", + "usagesDigest": "n18BVyKocdvBmyfemgDGgwEMuNYxJrwC8KgiO6KtTU0=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, diff --git a/cc/repositories.bzl b/cc/repositories.bzl index 6a58e432..47e23ef9 100644 --- a/cc/repositories.bzl +++ b/cc/repositories.bzl @@ -136,7 +136,7 @@ def aarch64_sysroot(): maybe( http_archive, name = "aarch64-sysroot", - sha256 = "d4f19fe984cfc413d5e7041c44241f536b33b76a8b49569edbcfdc0d405d30ee", + sha256 = "edb3599237a755287a3ca3c94bdd64eb7552b768e927a9d125473d0b846f91f4", build_file_content = """ filegroup( name = "aarch64-sysroot", @@ -144,14 +144,14 @@ filegroup( visibility = ["//visibility:public"], ) """, - url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-sysroot-beta4/debian_bullseye_aarch64_sysroot.tar.xz", + url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-sysroot-v4/debian_bullseye_aarch64_sysroot.tar.xz", ) def x86_64_sysroot(): maybe( http_archive, name = "x86_64-sysroot", - sha256 = "0b102b840f5d93072b8dd3049e7b231092e9d354b855c3beac46b4ecfd718916", + sha256 = "4235d41632c677d0c71e8e3b40abcf2b67e991e6b66a08cdf9d1e54a54de8869", build_file_content = """ filegroup( name = "x86_64-sysroot", @@ -159,7 +159,7 @@ filegroup( visibility = ["//visibility:public"], ) """, - url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-sysroot-beta4/debian_bullseye_x86_64_sysroot.tar.xz", + url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-sysroot-v4/debian_bullseye_x86_64_sysroot.tar.xz", ) def register_swift_cc_toolchains(): From b589be53bd2f157a2e63c9ab7a59b5000a27ae7f Mon Sep 17 00:00:00 2001 From: martin4861 Date: Mon, 27 Oct 2025 13:44:02 +0100 Subject: [PATCH 3/3] Bump MODULE version --- MODULE.bazel | 2 +- MODULE.bazel.lock | 2 +- examples/small_world/MODULE.bazel.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 230a9169..01e479e3 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -10,7 +10,7 @@ module( name = "rules_swiftnav", - version = "0.9.0", + version = "0.10.0", compatibility_level = 1, ) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index e925236e..d63b8c42 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -348,7 +348,7 @@ "//cc/toolchains/yocto_generic:yocto_generic_extension.bzl%yocto_generic_extension": { "general": { "bzlTransitiveDigest": "Q4v/HN5Wh/W0JsPpeExQzSqIslfepuWsd75kvW+25FI=", - "usagesDigest": "n18BVyKocdvBmyfemgDGgwEMuNYxJrwC8KgiO6KtTU0=", + "usagesDigest": "9JyFqb8fJB9ni5Z9NEEyRf5v7xZ04bDvWRjM5gnyZdM=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, diff --git a/examples/small_world/MODULE.bazel.lock b/examples/small_world/MODULE.bazel.lock index ae500805..5d54bed7 100644 --- a/examples/small_world/MODULE.bazel.lock +++ b/examples/small_world/MODULE.bazel.lock @@ -781,7 +781,7 @@ "@@rules_swiftnav+//cc:extensions.bzl%swift_cc_toolchain_extension": { "general": { "bzlTransitiveDigest": "12yxB33CfN0W3lUInFcfNacHnoMCa5xr0Kc+SXv/k4o=", - "usagesDigest": "f0HeWlPNwuIAtqAe+Vv26z6zmEtpRchgfWRCvQ5pK3c=", + "usagesDigest": "0fzxd3xIO0+3HljyxOjJ8lXOdZyJr9KKZKZDfnE3ScM=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {},