Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ common --registry=https://bcr.bazel.build

# Flags needed by score_baselibs and communication modules.
# Do not add more!
common --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
common --@score_baselibs//score/json:base_library=nlohmann
common --@score_communication//score/mw/com/flags:tracing_library=stub
common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False
Expand Down
12 changes: 12 additions & 0 deletions integration/patches/baselibs/0001-RH-exception-header.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/score/concurrency/clock.h b/score/concurrency/clock.h
index 0fa7719..365a003 100644
--- a/score/concurrency/clock.h
+++ b/score/concurrency/clock.h
@@ -15,6 +15,7 @@

#include <chrono>
#include <mutex>
+#include <exception>

namespace score
{
189 changes: 0 additions & 189 deletions integration/patches/baselibs/0001-fixes-for-aarch64.patch

This file was deleted.

36 changes: 36 additions & 0 deletions integration/patches/baselibs/0002-RH-algorithm-header.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
diff --git a/score/language/futurecpp/tests/member_iterator_test.cpp b/score/language/futurecpp/tests/member_iterator_test.cpp
index bea1361..6d649d2 100644
--- a/score/language/futurecpp/tests/member_iterator_test.cpp
+++ b/score/language/futurecpp/tests/member_iterator_test.cpp
@@ -9,6 +9,7 @@
#include <forward_list>
#include <list>
#include <vector>
+#include <algorithm>

#include <gtest/gtest.h>

diff --git a/score/language/futurecpp/tests/multi_span_test.cpp b/score/language/futurecpp/tests/multi_span_test.cpp
index 9b57903..c0da98b 100644
--- a/score/language/futurecpp/tests/multi_span_test.cpp
+++ b/score/language/futurecpp/tests/multi_span_test.cpp
@@ -11,6 +11,7 @@
#include <cstdint>
#include <numeric>
#include <sstream>
+#include <algorithm>

#include <gtest/gtest.h>

diff --git a/score/mw/log/detail/logging_identifier.h b/score/mw/log/detail/logging_identifier.h
index ec02bac..b15bdfa 100644
--- a/score/mw/log/detail/logging_identifier.h
+++ b/score/mw/log/detail/logging_identifier.h
@@ -19,6 +19,7 @@

#include <array>
#include <functional>
+#include <algorithm>

namespace score
{
65 changes: 65 additions & 0 deletions integration/patches/baselibs/003-acl-fixes-for-aarch64.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
From 37a6329193e94d93fef91fc184e95e9a8b67a98b Mon Sep 17 00:00:00 2001
From: Pawel Rutka <pawel.rutka.ext@qorix.ai>
Date: Mon, 9 Feb 2026 14:51:53 +0100
Subject: [PATCH] T

Signed-off-by: Pawel Rutka <pawel.rutka.ext@qorix.ai>
---
MODULE.bazel | 7 +++++++
third_party/acl/BUILD | 6 +++++-
third_party/acl/acl.BUILD | 7 ++++---
3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index f7991cb..b78d618 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -64,6 +64,13 @@ deb(
visibility = ["//visibility:public"],
)

+deb(
+ name = "acl-deb-aarch64",
+ build = "//third_party/acl:acl.BUILD",
+ urls = ["https://launchpadlibrarian.net/581258948/libacl1-dev_2.3.1-1_arm64.deb"],
+ visibility = ["//visibility:public"],
+)
+
deb(
name = "valgrind-deb",
build = "//third_party/valgrind:valgrind.BUILD",
diff --git a/third_party/acl/BUILD b/third_party/acl/BUILD
index dfcac1e..c76bee3 100644
--- a/third_party/acl/BUILD
+++ b/third_party/acl/BUILD
@@ -1,5 +1,9 @@
alias(
name = "acl",
- actual = "@acl-deb//:acl",
+ actual = select({
+ "@platforms//cpu:aarch64": "@acl-deb-aarch64//:acl",
+ "//conditions:default": "@acl-deb//:acl",
+ }),
visibility = ["//visibility:public"],
)
+
diff --git a/third_party/acl/acl.BUILD b/third_party/acl/acl.BUILD
index 2163068..d86c7f7 100644
--- a/third_party/acl/acl.BUILD
+++ b/third_party/acl/acl.BUILD
@@ -1,8 +1,9 @@
cc_library(
name = "acl",
- srcs = [
- "usr/lib/libacl.a",
- ],
+ srcs = select({
+ "@platforms//cpu:aarch64": ["usr/lib/aarch64-linux-gnu/libacl.a"],
+ "//conditions:default": ["usr/lib/libacl.a"],
+ }),
hdrs = [
"usr/include/acl/libacl.h",
"usr/include/sys/acl.h",
--
2.43.0

32 changes: 32 additions & 0 deletions integration/patches/baselibs/fix_hard_coded_amd64.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
diff --git a/MODULE.bazel b/MODULE.bazel
index 16776ba..683c131 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -70,7 +70,7 @@ deb = use_repo_rule("@download_utils//download/deb:defs.bzl", "download_deb")
deb(
name = "acl-deb",
build = "//third_party/acl:acl.BUILD",
- urls = ["https://archive.ubuntu.com/ubuntu/pool/main/a/acl/libacl1-dev_2.2.52-3build1_amd64.deb"],
+ urls = ["https://launchpadlibrarian.net/581258948/libacl1-dev_2.3.1-1_arm64.deb"],
visibility = ["//visibility:public"],
)

diff --git a/third_party/acl/acl.BUILD b/third_party/acl/acl.BUILD
index 718726c..710befd 100644
--- a/third_party/acl/acl.BUILD
+++ b/third_party/acl/acl.BUILD
@@ -1,7 +1,7 @@
cc_library(
name = "acl",
srcs = [
- "usr/lib/libacl.a",
+ "usr/lib/aarch64-linux-gnu/libacl.a",
],
hdrs = [
"usr/include/acl/libacl.h",
@@ -9,4 +9,4 @@ cc_library(
],
includes = ["usr/include/"],
visibility = ["//visibility:public"],
-)
+)
4 changes: 0 additions & 4 deletions score_modules.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ git_override(
module_name = "score_baselibs",
remote = "https://github.com/eclipse-score/baselibs.git",
commit = "ffd1c812213c66a436ed982632f6942528b58be8",
patch_strip = 1,
patches = [
"//integration/patches/baselibs:0001-fixes-for-aarch64.patch",
],
)

bazel_dep(name = "score_baselibs_rust")
Expand Down
Loading