Skip to content
Draft
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
6,973 changes: 6,972 additions & 1 deletion MODULE.bazel.lock

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions bazel_common/score_modules_target_sw.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,16 @@ git_override(
commit = "0e9187f79a9935ca192779234b82f9d00dc4e335",
remote = "https://github.com/eclipse-score/logging.git",
)

bazel_dep(name = "classic-diagnostic-adapter")
git_override(
module_name = "classic-diagnostic-adapter",
commit = "0656ae80ebf04b42329b41b47ce3947166753f92",
patch_strip = 1,
patches = [
#"//patches/diagnostics:002-cda-mbedtls-bindgen-multiarch-include.patch",
#"//patches/diagnostics:004-cda-mbedtls-ed25519-linkstatic.patch",
"//patches/diagnostics:003-cda-mbedtls-use-ext-build-deps-for-csrc.patch",
],
remote = "https://github.com/eclipse-opensovd/classic-diagnostic-adapter.git",
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/comm-mbedtls/mbedtls-sys/build.rs b/comm-mbedtls/mbedtls-sys/build.rs
index 8543d8a..21d2a47 100644
--- a/comm-mbedtls/mbedtls-sys/build.rs
+++ b/comm-mbedtls/mbedtls-sys/build.rs
@@ -183,8 +183,14 @@ fn generate_bindings(mbedtls_src: &Path, manifest_dir: &Path, out_dir: &Path) {
.clang_arg("-DMBEDTLS_SSL_NULL_CIPHERSUITES")
.clang_arg("-DMBEDTLS_ED25519_PSA_DRIVER");

if let Ok(sysroot) = env::var("BINDGEN_SYSROOT") {
- builder = builder.clang_arg(format!("--sysroot={sysroot}"));
+ let sysroot = PathBuf::from(sysroot);
+ builder = builder.clang_arg(format!("--sysroot={}", sysroot.display()));
+
+ let multiarch_include = sysroot.join("usr").join("aarch64-linux-gnu").join("include");
+ if multiarch_include.exists() {
+ builder = builder.clang_arg(format!("-isystem{}", multiarch_include.display()));
+ }
}

let bindings = builder
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/third_party/mbedtls/BUILD.bazel b/third_party/mbedtls/BUILD.bazel
index b49a1e1..bcf9fd7 100644
--- a/third_party/mbedtls/BUILD.bazel
+++ b/third_party/mbedtls/BUILD.bazel
@@ -21,7 +21,7 @@ cmake(
cache_entries = {
# Force ar instead of libtool to avoid rules_foreign_cc wrapper issues on macOS
"CMAKE_AR": "/usr/bin/ar",
- "CMAKE_C_FLAGS": "-DMBEDTLS_SSL_RECORD_SIZE_LIMIT -DMBEDTLS_SSL_NULL_CIPHERSUITES -DMBEDTLS_ED25519_PSA_DRIVER -I$$EXT_BUILD_ROOT$$/comm-mbedtls/mbedtls-sys/csrc",
+ "CMAKE_C_FLAGS": "-DMBEDTLS_SSL_RECORD_SIZE_LIMIT -DMBEDTLS_SSL_NULL_CIPHERSUITES -DMBEDTLS_ED25519_PSA_DRIVER -I$$EXT_BUILD_ROOT$$/external/classic-diagnostic-adapter+/comm-mbedtls/mbedtls-sys/csrc",
"ENABLE_PROGRAMS": "OFF",
"ENABLE_TESTING": "OFF",
"GEN_FILES": "OFF",
14 changes: 14 additions & 0 deletions patches/diagnostics/004-cda-mbedtls-ed25519-linkstatic.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/third_party/mbedtls/BUILD.bazel b/third_party/mbedtls/BUILD.bazel
index b49a1e1..d2a3f11 100644
--- a/third_party/mbedtls/BUILD.bazel
+++ b/third_party/mbedtls/BUILD.bazel
@@ -46,6 +46,7 @@ cc_library(
hdrs = [
"//comm-mbedtls/mbedtls-sys:csrc/ed25519_extract.h",
"//comm-mbedtls/mbedtls-sys:csrc/ed25519_psa_driver.h",
],
alwayslink = True,
+ linkstatic = True,
copts = ["-DMBEDTLS_ED25519_PSA_DRIVER"],
deps = [":mbedtls"],
)
Empty file added patches/diagnostics/BUILD
Empty file.
Loading