!230 [sync] PR-227: [手工同步PR]将riscv64加入支持的架构

From: @openeuler-sync-bot 
Reviewed-by: @xujing99 
Signed-off-by: @xujing99
This commit is contained in:
openeuler-ci-bot 2024-05-08 01:03:40 +00:00 committed by Gitee
commit 8e8316876b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 46 additions and 1 deletions

View File

@ -0,0 +1,41 @@
From 7332245a8f59de83485208282f2a15beaf5e544f Mon Sep 17 00:00:00 2001
From: laokz <zhangkai@iscas.ac.cn>
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

View File

@ -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 <zhangkai@iscas.ac.cn> - 30-42
- add riscv64 to some arches macro
* Mon Apr 29 2024 xujing <xujing125@huawei.com> - 30-41
- don't delete the commented code in macros