Skip to content

Commit 3e0aa1f

Browse files
authored
Merge pull request #6209 from martin-frbg/ci_fix_c910v_qemu
CI: RISCV-C910V: Backport qemu fix for building on systems with glibc-2.41 and newer
2 parents 8f8a45e + eeef1ff commit 3e0aa1f

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

‎.github/workflows/c910v.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ permissions:
2020
jobs:
2121
TEST:
2222
if: "github.repository == 'OpenMathLib/OpenBLAS'"
23-
runs-on: ubuntu-latest
23+
runs-on: ubuntu-24.04
2424
env:
2525
xuetie_toolchain: https://occ-oss-prod.oss-cn-hangzhou.aliyuncs.com/resource//1698113812618
2626
toolchain_file_name: Xuantie-900-gcc-linux-5.10.4-glibc-x86_64-V2.8.0-20231018.tar.gz
@@ -60,9 +60,12 @@ jobs:
6060
wget https://github.com/revyos/qemu/commit/222729c7455784dd855216d7a2bec4bd8f2a6800.patch
6161
# Backport the upstream linux-user clone_lock fix
6262
wget -O qemu-clone-lock.patch https://gitlab.com/qemu-project/qemu/-/commit/d22e9aec572396836782e993cb18d598e6012688.patch
63+
# Backport the upstream linux-user fix for building against glibc-2.41+ that already defines sched_attr
64+
wget -O qemu-sched-attr.patch https://gitlab.com/qemu-project/qemu/-/commit/27a8d899c7a100fd5aa040a8b993bb257687c393.patch
6365
cd qemu
6466
patch -p1 < ../222729c7455784dd855216d7a2bec4bd8f2a6800.patch
6567
patch -p1 < ../qemu-clone-lock.patch
68+
patch -p1 < ../qemu-sched-attr.patch
6669
export CXXFLAGS="-Wno-error"; export CFLAGS="-Wno-error"
6770
./configure --prefix=$GITHUB_WORKSPACE/qemu-install --target-list=riscv64-linux-user --disable-system
6871
make -j$(nproc)

0 commit comments

Comments
 (0)