Skip to content

Commit

Permalink
Merge pull request #3517 from balena-os/alexgg/glibc-2.39-gcc-13
Browse files Browse the repository at this point in the history
Fix builds for host distributions that use glibc-2.39 and gcc 13 - like Ubuntu 24.04
  • Loading branch information
flowzone-app[bot] authored Sep 20, 2024
2 parents 9a9378b + 61265dc commit a39a91a
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye
FROM debian:trixie

VOLUME /mnt/sysroot/inactive

Expand Down
3 changes: 2 additions & 1 deletion meta-balena-rust/recipes-devtools/rust/rust-llvm.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From a94bf34221fc4519bd8ec72560c2d363ffe2de4c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <[email protected]>
Date: Mon, 23 May 2022 08:03:23 +0100
Subject: [PATCH] [Support] Add missing <cstdint> 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 <[email protected]>
Signed-off-by: Alexander Sverdlin <[email protected]>
---
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 <cstdint>
#include <string>

namespace llvm {

0 comments on commit a39a91a

Please sign in to comment.