From c8863a14595c7147a7072b21420eb803ef146779 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Mon, 16 Sep 2024 12:45:05 +0200 Subject: [PATCH 1/2] meta-balena-rust: rust-llvm: backport a fix for build with gcc-13 * needed for rust-llvm-native on hosts with gcc-13 (backport from 335eb3a93e96 rust-llvm: backport a fix for build with gcc-13) Change-type: patch Signed-off-by: Alex Gonzalez --- .../recipes-devtools/rust/rust-llvm.inc | 3 +- ...-missing-cstdint-header-to-Signals.h.patch | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 meta-balena-rust/recipes-devtools/rust/rust-llvm/0003-Support-Add-missing-cstdint-header-to-Signals.h.patch diff --git a/meta-balena-rust/recipes-devtools/rust/rust-llvm.inc b/meta-balena-rust/recipes-devtools/rust/rust-llvm.inc index 9baad12dc8..68b495edcf 100644 --- a/meta-balena-rust/recipes-devtools/rust/rust-llvm.inc +++ b/meta-balena-rust/recipes-devtools/rust/rust-llvm.inc @@ -4,7 +4,8 @@ HOMEPAGE = "http://www.rust-lang.org" SRC_URI += "file://0002-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ - file://0003-llvm-fix-include-benchmarks.patch;striplevel=2" + file://0003-Support-Add-missing-cstdint-header-to-Signals.h.patch;striplevel=2 \ + file://0003-llvm-fix-include-benchmarks.patch;striplevel=2" S = "${RUSTSRC}/src/llvm-project/llvm" diff --git a/meta-balena-rust/recipes-devtools/rust/rust-llvm/0003-Support-Add-missing-cstdint-header-to-Signals.h.patch b/meta-balena-rust/recipes-devtools/rust/rust-llvm/0003-Support-Add-missing-cstdint-header-to-Signals.h.patch new file mode 100644 index 0000000000..6ed23aa9c5 --- /dev/null +++ b/meta-balena-rust/recipes-devtools/rust/rust-llvm/0003-Support-Add-missing-cstdint-header-to-Signals.h.patch @@ -0,0 +1,32 @@ +From a94bf34221fc4519bd8ec72560c2d363ffe2de4c Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 23 May 2022 08:03:23 +0100 +Subject: [PATCH] [Support] Add missing header to Signals.h + +Without the change llvm build fails on this week's gcc-13 snapshot as: + + [ 0%] Building CXX object lib/Support/CMakeFiles/LLVMSupport.dir/Signals.cpp.o + In file included from llvm/lib/Support/Signals.cpp:14: + llvm/include/llvm/Support/Signals.h:119:8: error: variable or field 'CleanupOnSignal' declared void + 119 | void CleanupOnSignal(uintptr_t Context); + | ^~~~~~~~~~~~~~~ + +Upstream-Status: Backport [llvmorg-15.0.0 ff1681ddb303223973653f7f5f3f3435b48a1983] +Signed-off-by: Martin Jansa +Signed-off-by: Alexander Sverdlin +--- + llvm/include/llvm/Support/Signals.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/llvm/include/llvm/Support/Signals.h b/llvm/include/llvm/Support/Signals.h +index 44f5a750ff5c..937e0572d4a7 100644 +--- a/llvm/include/llvm/Support/Signals.h ++++ b/llvm/include/llvm/Support/Signals.h +@@ -14,6 +14,7 @@ + #ifndef LLVM_SUPPORT_SIGNALS_H + #define LLVM_SUPPORT_SIGNALS_H + ++#include + #include + + namespace llvm { From 61265dc52127a461b476c225268e3d6be6f9eabf Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Mon, 16 Sep 2024 15:30:43 +0200 Subject: [PATCH 2/2] mkfs-hostapp-native: update Dockerfile to using trixie This is required to be able to build in host distributions that use glibc v2.39 to avoid errors such as: ``` | + hostapp-update -f /input -n | Running hostapp update... | touch: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.38' not found (required by touch) ``` Change-type: patch Signed-off-by: Alex Gonzalez --- .../recipes-containers/mkfs-hostapp-native/files/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-balena-common/recipes-containers/mkfs-hostapp-native/files/Dockerfile b/meta-balena-common/recipes-containers/mkfs-hostapp-native/files/Dockerfile index daf9f13afe..95be5d9661 100644 --- a/meta-balena-common/recipes-containers/mkfs-hostapp-native/files/Dockerfile +++ b/meta-balena-common/recipes-containers/mkfs-hostapp-native/files/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye +FROM debian:trixie VOLUME /mnt/sysroot/inactive