update

Signed-off-by: wep21 <[email protected]>
bazelbuild · Dec 29, 2024 · 4ecb21b · 4ecb21b
1 parent b7ff8d4
commit 4ecb21b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/modules/iceoryx2/0.5.0/patches/bindgen.patch b/modules/iceoryx2/0.5.0/patches/bindgen.patch
@@ -1,5 +1,5 @@
 diff --git iceoryx2-ffi/ffi/BUILD.bazel iceoryx2-ffi/ffi/BUILD.bazel
-index f2738f81..8c93b3a2 100644
+index f2738f81..d294d862 100644
 --- iceoryx2-ffi/ffi/BUILD.bazel
 +++ iceoryx2-ffi/ffi/BUILD.bazel
 @@ -20,9 +20,10 @@ filegroup(
@@ -16,7 +16,7 @@ index f2738f81..8c93b3a2 100644
  )
 
  genrule(
-@@ -31,11 +32,12 @@ genrule(
+@@ -31,11 +32,17 @@ genrule(
          "//:all_srcs",
          "Cargo.toml",
          "cbindgen.toml",
@@ -26,8 +26,13 @@ index f2738f81..8c93b3a2 100644
      outs = ["include/iox2/iceoryx2.h"],
      # this is actually just 'cbindgen iceoryx2-ffi/ffi --quiet --config iceoryx2-ffi/ffi/cbindgen.toml --output include/iox2/iceoryx2.h'
 -    cmd = "$(execpath :cbindgen-cli) $$(dirname $(location Cargo.toml)) --quiet --config $(location cbindgen.toml) --output $(OUTS)",
-+    cmd = "$(execpath :cbindgen) $$(dirname $(location Cargo.toml)) --quiet --config $(location cbindgen.toml) --output $(OUTS)",
-+    local = True,
++    cmd = """
++export PATH=$$(dirname $$(realpath $(location @rules_rust//rust/toolchain:current_cargo_files))):$$PATH
++$(execpath :cbindgen) $$(dirname $(location Cargo.toml)) --quiet --config $(location cbindgen.toml) --output $(OUTS)
++""",
++    tools = [
++        "@rules_rust//rust/toolchain:current_cargo_files",
++    ],
  )
 
  rust_shared_library(

diff --git a/modules/iceoryx2/0.5.0/presubmit.yml b/modules/iceoryx2/0.5.0/presubmit.yml
@@ -1,9 +1,7 @@
 matrix:
   platform:
-    - debian11
     - macos
     - macos_arm64
-    - ubuntu2004
     - ubuntu2204
     - ubuntu2404
   bazel: [7.x, 8.x, rolling]
@@ -26,6 +24,28 @@ tasks:
       - "--enable_bzlmod"
       - "--incompatible_disallow_empty_glob=false"
       - "--cxxopt=-std=c++17"
-      - "--linkopt=-lstdc++fs"
+      - "--linkopt=-lrt,-lstdc++fs"
+    build_targets:
+      - "@iceoryx2//..."
+  verify_debian11_targets:
+    name: Verify build targets
+    platform: debian11
+    bazel: ${{ bazel }}
+    build_flags:
+      - "--enable_bzlmod"
+      - "--incompatible_disallow_empty_glob=false"
+      - "--cxxopt=-std=c++17"
+      - "--linkopt=-lrt"
+    build_targets:
+      - "@iceoryx2//..."
+  verify_ubuntu2004_targets:
+    name: Verify build targets
+    platform: ubuntu2004
+    bazel: ${{ bazel }}
+    build_flags:
+      - "--enable_bzlmod"
+      - "--incompatible_disallow_empty_glob=false"
+      - "--cxxopt=-std=c++17"
+      - "--linkopt=-lrt"
     build_targets:
       - "@iceoryx2//..."
diff --git a/modules/iceoryx2/0.5.0/source.json b/modules/iceoryx2/0.5.0/source.json
@@ -7,6 +7,6 @@
         "MODULE.bazel": "sha256-5TJVZ/XxDuu6F2R+3TJQQix3XhXdwjKIyWtyY7YAVu8="
     },
     "patches": {
-        "bindgen.patch": "sha256-/moEJpn9m5eUqzFcLhd+UjmK4QLvJdJdvw8RyENH/ig="
+        "bindgen.patch": "sha256-/dge8FyZJhabniA9qJsg3+xEiQBQsFLV2jEDagZyag8="
     }
 }