From ef12f32e804037b88eeaf967b9af60b4ba5d8d2c Mon Sep 17 00:00:00 2001 From: laokz Date: Tue, 7 May 2024 10:24:49 +0800 Subject: [PATCH] add riscv64 to some arches macro (cherry picked from commit 3de37a4eed9e18d0237fcfdb5074d84197384ec6) --- 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..0dca59b --- /dev/null +++ b/add-riscv64-to-some-arches-macro.patch @@ -0,0 +1,41 @@ +From 7332245a8f59de83485208282f2a15beaf5e544f Mon Sep 17 00:00:00 2001 +From: laokz +Date: Tue, 7 May 2024 10:21:52 +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 ddee753..bf82bc5 100644 +--- a/macros ++++ b/macros +@@ -244,7 +244,7 @@ + %generic_arches %{ix86} x86_64 %{arm} aarch64 sw_64 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} +@@ -253,11 +253,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 8975cb1..6cb4af8 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 41 +Release: 42 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -33,6 +33,7 @@ Patch19: check-if-the-file-is-a-symbolic-link-in-brp-digest-list.patch Patch20: fix-the-ELF-file-cannot-be-found-due-to-escape-of.patch Patch21: add-powerpc64le-and-ppc64le-support.patch Patch22: Delete-the-commented-code.patch +Patch23: add-riscv64-to-some-arches-macro.patch Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} @@ -140,6 +141,9 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir %{rpmvdir}/find-requires.ksyms %changelog +* Tue May 07 2024 laokz - 30-42 +- add riscv64 to some arches macro + * Mon Apr 29 2024 xujing - 30-41 - don't delete the commented code in macros -- Gitee