!214 将riscv64加入若干架构宏

From: @laokz 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2024-04-28 03:05:52 +00:00 committed by Gitee
commit a0457915a7
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 09e746df9d0c333fef9aabcec3047f68c9d1fc60 Mon Sep 17 00:00:00 2001
From: laokz <zhangkai@iscas.ac.cn>
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

View File

@ -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 <zhangkai@iscas.ac.cn> - 30-55
- add riscv64 to some arches macro
* Sun Apr 7 2024 zhangguangzhi <zhangguangzhi3@huawei.com> - 30-54
- ima digest list ebs sign ret 2 when errmsg is SIGN_PERMISSION_DENIED