From 009d72f4f6da874895fadef4bdc3bc413d00be69 Mon Sep 17 00:00:00 2001 From: laokz Date: Sat, 27 Apr 2024 15:24:09 +0800 Subject: [PATCH] add riscv64 to some arches macro (cherry picked from commit f5c9b6d04beef74d8e1d9c12e01c1a9aa8afd47e) --- add-riscv64-to-some-arches-macro.patch | 41 ++++++++++++++++++++++++++ openEuler-rpm-config.spec | 6 +++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 add-riscv64-to-some-arches-macro.patch diff --git a/add-riscv64-to-some-arches-macro.patch b/add-riscv64-to-some-arches-macro.patch new file mode 100644 index 0000000..987acea --- /dev/null +++ b/add-riscv64-to-some-arches-macro.patch @@ -0,0 +1,41 @@ +From 09e746df9d0c333fef9aabcec3047f68c9d1fc60 Mon Sep 17 00:00:00 2001 +From: laokz +Date: Sat, 27 Apr 2024 15:09:30 +0800 +Subject: [PATCH] add riscv64 to some arches macro + +--- + macros | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/macros b/macros +index 218cd23..c609e85 100644 +--- a/macros ++++ b/macros +@@ -310,7 +310,7 @@ + %generic_arches %{ix86} x86_64 %{arm} aarch64 loongarch64 powerpc64le ppc64le + %ldc_arches %{generic_arches} + %valgrind_arches %{generic_arches} +-%nodejs_arches %{generic_arches} ++%nodejs_arches %{generic_arches} riscv64 + %ldc_arches %{generic_arches} + %mono_arches %{generic_arches} + %fpc_arches %{generic_arches} +@@ -319,11 +319,10 @@ + %GNAT_arches %{GPRbuild_arches} %{generic_arches} + %GPRbuild_arches %{generic_arches} + %nim_arches %{generic_arches} +-%nodejs_arches %{generic_arches} +-%ocaml_native_compiler %{generic_arches} +-%ocaml_natdynlink %{generic_arches} +-%ocaml_native_profiling %{generic_arches} +-%openblas_arches %{generic_arches} ++%ocaml_native_compiler %{generic_arches} riscv64 ++%ocaml_natdynlink %{generic_arches} riscv64 ++%ocaml_native_profiling %{generic_arches} riscv64 ++%openblas_arches %{generic_arches} riscv64 + + #%ldconfig /sbin/ldconfig + %ldconfig_post(n:) %{?ldconfig:%post -p %ldconfig %{?*} %{-n:-n %{-n*}}\ +-- +2.39.2 + diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index bd44e06..93a844a 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 54 +Release: 55 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -38,6 +38,7 @@ Patch24: Delete-the-commented-code.patch Patch25: Add-support-for-selecting-clang-as-a-toolchain.patch Patch26: Call-set_build_flags-cc-before-build-check-and-insta.patch Patch27: openEuler-rpm-config-add-optflags-for-loongarch64-and-sw_64.patch +Patch28: add-riscv64-to-some-arches-macro.patch Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} @@ -149,6 +150,9 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir %{rpmvdir}/find-requires.ksyms %changelog +* Sun Apr 28 2024 laokz - 30-55 +- add riscv64 to some arches macro + * Sun Apr 7 2024 zhangguangzhi - 30-54 - ima digest list ebs sign ret 2 when errmsg is SIGN_PERMISSION_DENIED -- Gitee