90e6999a07
- Update to the stuff in master to fix the issue at: https://bodhi.fedoraproject.org/updates/FEDORA-2020-050993b283#comment-1208958 - Update to 3.0.11 (via patches generated from git) - Plus newer upstream fixes (also via patches generated from git) - Fix shell exit failures in make - Fix .reloc section generation - Fix CHAR8 definition - Fix "make DESTDIR=..." - Change the installed .a/.o layout - Provide makefiles for consumers to use. - Make the -devel noarch since it's just headers. - Add a bunch of compatibility symlinks for our older packages. These will go away once we've migrated everything using them in fedora to use the newer make system... Signed-off-by: Peter Jones <pjones@redhat.com>
41 lines
911 B
Diff
41 lines
911 B
Diff
From 486ba3c3bdd147b7d98159b9e650be60bce0f027 Mon Sep 17 00:00:00 2001
|
|
From: leo <leo.sartre@geebol.fr>
|
|
Date: Wed, 15 May 2019 05:32:21 +0200
|
|
Subject: [PATCH 10/46] Do not include efisetjmp.h on efi.h
|
|
|
|
People than really want to use efisetjmp implementation can include
|
|
the header on their own.
|
|
|
|
Signed-off-by: leo <leo.sartre@geebol.fr>
|
|
---
|
|
apps/setjmp.c | 1 +
|
|
inc/efi.h | 1 -
|
|
2 files changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/apps/setjmp.c b/apps/setjmp.c
|
|
index b20070e7c95..d9e0f290dd2 100644
|
|
--- a/apps/setjmp.c
|
|
+++ b/apps/setjmp.c
|
|
@@ -1,6 +1,7 @@
|
|
|
|
#include <efi.h>
|
|
#include <efilib.h>
|
|
+#include <efisetjmp.h>
|
|
|
|
EFI_STATUS
|
|
efi_main(
|
|
diff --git a/inc/efi.h b/inc/efi.h
|
|
index 9cbc22dc370..2ddd53e0d95 100644
|
|
--- a/inc/efi.h
|
|
+++ b/inc/efi.h
|
|
@@ -57,6 +57,5 @@ Revision History
|
|
#include "efiudp.h"
|
|
#include "efitcp.h"
|
|
#include "efipoint.h"
|
|
-#include "efisetjmp.h"
|
|
|
|
#endif
|
|
--
|
|
2.24.1
|
|
|