From 18cc5238f0a3de755ad8c2259c35a71623c8c266 Mon Sep 17 00:00:00 2001 From: "yan.yihao 10263201" Date: Wed, 2 Jul 2025 15:17:15 +0800 Subject: [PATCH] fix build error for riscv64 --- 0002-disable-spinlocks-for-riscv64.patch | 12 ++++++++++++ polardb.spec | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 0002-disable-spinlocks-for-riscv64.patch diff --git a/0002-disable-spinlocks-for-riscv64.patch b/0002-disable-spinlocks-for-riscv64.patch new file mode 100644 index 0000000..e3060f7 --- /dev/null +++ b/0002-disable-spinlocks-for-riscv64.patch @@ -0,0 +1,12 @@ +diff -urN a/polardb_build.sh b/polardb_build.sh +--- a/polardb_build.sh 2025-07-01 23:02:07.164001669 -0400 ++++ b/polardb_build.sh 2025-07-01 23:06:04.614660062 -0400 +@@ -510,7 +510,7 @@ + configure_flag+=" --with-dma" + fi + +-if [[ `uname -m` == "loongarch64" ]] ++if [[ `uname -m` =~ loongarch64|riscv64 ]] + then + configure_flag+=" --disable-spinlocks" + fi diff --git a/polardb.spec b/polardb.spec index 03880e1..8ad6e70 100644 --- a/polardb.spec +++ b/polardb.spec @@ -1,4 +1,4 @@ -%define anolis_release 5 +%define anolis_release 6 %global debug_package %{nil} %global _privatelibs lib(.*).so* %global __provides_exclude ^(%{_privatelibs})$ @@ -11,6 +11,7 @@ License: Apache License Url: https://github.com/ApsaraDB/PolarDB-for-PostgreSQL Source0: https://github.com/ApsaraDB/PolarDB-for-PostgreSQL/archive/refs/tags/v%{version}.tar.gz Patch001: 0001-disable-spinlocks-for-loongarch64.patch +Patch002: 0002-disable-spinlocks-for-riscv64.patch BuildRequires: libzstd-devel openssl-devel protobuf-devel readline-devel libxml2-devel libxslt-devel zlib-devel bzip2-devel lz4-devel snappy-devel BuildRequires: libzstd zstd cmake perl bison flex @@ -50,6 +51,9 @@ mkdir -p %{buildroot}/%{_prefix} %{_datadir}/* %changelog +* Wed Jul 2 2025 Yihao Yan - 11.9.20.0-6 +- fix build error for riscv64 + * Wed Jun 4 2025 wh02252983 - 11.9.20.0-5 - Use Upstream tar -- Gitee