packages/gnu-efi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!31 fix compilation failure on riscv64

Browse Source 
From: @East_x 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
This commit is contained in:
openeuler-ci-bot 2023-09-28 13:33:18 +00:00 committed by Gitee
commit 7fa5225b27
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu-efi.spec
View File

@ -1,7 +1,7 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: gnu-efi Name: gnu-efi
Version: 3.0.17 Version: 3.0.17
Release: 5 Release: 6
Summary: Development Libraries and headers for EFI Summary: Development Libraries and headers for EFI
Epoch: 1 Epoch: 1
License: BSD License: BSD
@ -12,6 +12,10 @@ Source0: https://sourceforge.net/projects/gnu-efi/files/%{name}-%{version}
Source1: stubs-32.h Source1: stubs-32.h
Patch1: 0001-gnu-efi-add-CHAR16-for-loongarch64.patch Patch1: 0001-gnu-efi-add-CHAR16-for-loongarch64.patch
%ifarch riscv64
Patch2: riscv64-fix-efibind.h-missing-duplicate-types.patch
%endif
%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed 's/^ID=//')) %global efidir %(eval echo $(grep ^ID= /etc/os-release | sed 's/^ID=//'))
%ifarch x86_64 %ifarch x86_64
@ -87,6 +91,9 @@ mv ia32/apps/{route80h.efi,modelist.efi} %{buildroot}/boot/efi/EFI/%{efidir}/ia3
%{_includedir}/efi %{_includedir}/efi
%changelog %changelog
* Wed Sep 6 2023 EastDong <xudong23@iscas.ac.cn> - 1:3.0.17-6
- fix build error in RISC-V
* Mon Aug 28 2023 chenchen <chen_aka_jan@163.com> - 1:3.0.17-5 * Mon Aug 28 2023 chenchen <chen_aka_jan@163.com> - 1:3.0.17-5
- unset ldflags for fix build error - unset ldflags for fix build error

31
riscv64-fix-efibind.h-missing-duplicate-types.patch Normal file
View File

@ -0,0 +1,31 @@
From 5d4343079fd8c23f2e1773bec6c1630918eda441 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Thu, 18 May 2023 13:30:07 +0100
Subject: [PATCH] riscv64: fix efibind.h missing/duplicate types
The RISC-V 64 definition for CHAR8 is missing, so add it.
Likewise, BOOLEAN is defined in inc/efidef.h, so remove it.
---
inc/riscv64/efibind.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/inc/riscv64/efibind.h b/inc/riscv64/efibind.h
index 4fdf81d..d8b4f39 100644
--- a/inc/riscv64/efibind.h
+++ b/inc/riscv64/efibind.h
@@ -32,11 +32,9 @@ typedef uint16_t UINT16;
typedef int16_t INT16;
typedef uint8_t UINT8;
typedef int8_t INT8;
+typedef char CHAR8;
typedef wchar_t CHAR16;
#define WCHAR CHAR16
-#ifndef BOOLEAN
-typedef uint8_t BOOLEAN;
-#endif
#undef VOID
typedef void VOID;
typedef int64_t INTN;
--
2.39.1.windows.1