From 758f9072ba1c4e8d3c8cb6070a50198c648e3b6c Mon Sep 17 00:00:00 2001 From: Bill Roberts Date: Fri, 19 Jan 2024 10:51:12 -0600 Subject: [PATCH 1/2] build: support lib64 out directories Signed-off-by: Bill Roberts --- psa-crypto-sys/build.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/psa-crypto-sys/build.rs b/psa-crypto-sys/build.rs index 6eb2a4b..25bddec 100644 --- a/psa-crypto-sys/build.rs +++ b/psa-crypto-sys/build.rs @@ -308,6 +308,10 @@ mod operations { let mut mbed_lib_dir = compile_mbed_crypto()?; let mut mbed_include_dir = mbed_lib_dir.clone(); mbed_lib_dir.push("lib"); + if !mbed_lib_dir.as_path().exists() { + _ = mbed_lib_dir.pop(); + mbed_lib_dir.push("lib64"); + } mbed_include_dir.push("include"); lib = mbed_lib_dir.to_str().unwrap().to_owned(); @@ -357,6 +361,11 @@ mod operations { let mut mbed_lib_dir = compile_mbed_crypto()?; let mut mbed_include_dir = mbed_lib_dir.clone(); mbed_lib_dir.push("lib"); + if !mbed_lib_dir.as_path().exists() { + _ = mbed_lib_dir.pop(); + mbed_lib_dir.push("lib64"); + } + mbed_include_dir.push("include"); let main_lib = mbed_lib_dir.join("libmbedcrypto.a"); @@ -388,6 +397,7 @@ mod operations { let (from, _) = &lib; args.push(from.as_os_str()); } + println!("BILL: args: {:?}", args); let output = std::process::Command::new("nm") .args(args) .output() From 64f7c1c162a2fbc31909a05833c1963bc01df00d Mon Sep 17 00:00:00 2001 From: Bill Roberts Date: Fri, 19 Jan 2024 09:30:06 -0600 Subject: [PATCH 2/2] mbedtls: update to version 3.5.1 Signed-off-by: Bill Roberts --- psa-crypto-sys/build.rs | 2 +- psa-crypto-sys/vendor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/psa-crypto-sys/build.rs b/psa-crypto-sys/build.rs index 25bddec..fdcc60c 100644 --- a/psa-crypto-sys/build.rs +++ b/psa-crypto-sys/build.rs @@ -397,7 +397,7 @@ mod operations { let (from, _) = &lib; args.push(from.as_os_str()); } - println!("BILL: args: {:?}", args); + let output = std::process::Command::new("nm") .args(args) .output() diff --git a/psa-crypto-sys/vendor b/psa-crypto-sys/vendor index 8df2f8e..edb8fec 160000 --- a/psa-crypto-sys/vendor +++ b/psa-crypto-sys/vendor @@ -1 +1 @@ -Subproject commit 8df2f8e7b9c7bb9390ac74bb7bace27edca81a2b +Subproject commit edb8fec9882084344a314368ac7fd957a187519c