Skip to content

Commit cf1f465

Browse files
committed
Add classic-diagnostic-adapter dependency with git override
- Introduced a new bazel dependency for classic-diagnostic-adapter. - Added git override for classic-diagnostic-adapter to specify the commit and remote repository.
1 parent 07e75c4 commit cf1f465

6 files changed

Lines changed: 7032 additions & 1 deletion

MODULE.bazel.lock

Lines changed: 6972 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel_common/score_modules_target_sw.MODULE.bazel

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,16 @@ git_override(
7575
commit = "0e9187f79a9935ca192779234b82f9d00dc4e335",
7676
remote = "https://github.com/eclipse-score/logging.git",
7777
)
78+
79+
bazel_dep(name = "classic-diagnostic-adapter")
80+
git_override(
81+
module_name = "classic-diagnostic-adapter",
82+
commit = "0656ae80ebf04b42329b41b47ce3947166753f92",
83+
patch_strip = 1,
84+
patches = [
85+
#"//patches/diagnostics:002-cda-mbedtls-bindgen-multiarch-include.patch",
86+
"//patches/diagnostics:003-cda-mbedtls-use-ext-build-deps-for-csrc.patch",
87+
"//patches/diagnostics:004-cda-mbedtls-ed25519-linkstatic.patch",
88+
],
89+
remote = "https://github.com/eclipse-opensovd/classic-diagnostic-adapter.git",
90+
)
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/comm-mbedtls/mbedtls-sys/build.rs b/comm-mbedtls/mbedtls-sys/build.rs
2+
index 8543d8a..21d2a47 100644
3+
--- a/comm-mbedtls/mbedtls-sys/build.rs
4+
+++ b/comm-mbedtls/mbedtls-sys/build.rs
5+
@@ -183,8 +183,14 @@ fn generate_bindings(mbedtls_src: &Path, manifest_dir: &Path, out_dir: &Path) {
6+
.clang_arg("-DMBEDTLS_SSL_NULL_CIPHERSUITES")
7+
.clang_arg("-DMBEDTLS_ED25519_PSA_DRIVER");
8+
9+
if let Ok(sysroot) = env::var("BINDGEN_SYSROOT") {
10+
- builder = builder.clang_arg(format!("--sysroot={sysroot}"));
11+
+ let sysroot = PathBuf::from(sysroot);
12+
+ builder = builder.clang_arg(format!("--sysroot={}", sysroot.display()));
13+
+
14+
+ let multiarch_include = sysroot.join("usr").join("aarch64-linux-gnu").join("include");
15+
+ if multiarch_include.exists() {
16+
+ builder = builder.clang_arg(format!("-isystem{}", multiarch_include.display()));
17+
+ }
18+
}
19+
20+
let bindings = builder
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/third_party/mbedtls/BUILD.bazel b/third_party/mbedtls/BUILD.bazel
2+
index b49a1e1..bcf9fd7 100644
3+
--- a/third_party/mbedtls/BUILD.bazel
4+
+++ b/third_party/mbedtls/BUILD.bazel
5+
@@ -21,7 +21,7 @@ cmake(
6+
cache_entries = {
7+
# Force ar instead of libtool to avoid rules_foreign_cc wrapper issues on macOS
8+
"CMAKE_AR": "/usr/bin/ar",
9+
- "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",
10+
+ "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",
11+
"ENABLE_PROGRAMS": "OFF",
12+
"ENABLE_TESTING": "OFF",
13+
"GEN_FILES": "OFF",
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/third_party/mbedtls/BUILD.bazel b/third_party/mbedtls/BUILD.bazel
2+
index b49a1e1..d2a3f11 100644
3+
--- a/third_party/mbedtls/BUILD.bazel
4+
+++ b/third_party/mbedtls/BUILD.bazel
5+
@@ -46,6 +46,7 @@ cc_library(
6+
hdrs = [
7+
"//comm-mbedtls/mbedtls-sys:csrc/ed25519_extract.h",
8+
"//comm-mbedtls/mbedtls-sys:csrc/ed25519_psa_driver.h",
9+
],
10+
alwayslink = True,
11+
+ linkstatic = True,
12+
copts = ["-DMBEDTLS_ED25519_PSA_DRIVER"],
13+
deps = [":mbedtls"],
14+
)

patches/diagnostics/BUILD

Whitespace-only changes.

0 commit comments

Comments
 (0)