1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00

gnu-efi: Upgrade 3.0.9 -> 3.0.10

Part of patch fixed upstream removed.

(From OE-Core rev: 82169fd7684389f9cdedd6f91a00698641741a8c)

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Adrian Bunk
2019-10-27 17:00:44 +02:00
committed by Richard Purdie
parent 3a751d5564
commit 5e040b69c3
3 changed files with 41 additions and 20 deletions
@@ -0,0 +1,38 @@
From 1f7b2e5bd6603b30202a66b6317a41e2be85742b Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben@haabendal.dk>
Date: Tue, 26 Mar 2019 13:37:02 +0100
Subject: Revert "efilink: fix build with gcc 4.8"
This reverts commit 6335e5c697c57d8b5854b8202de3733bcb151ca6, as it breaks
gcc builds with '-nostdinc' flag.
The fix in 1a53d8f88a452847b25f9689f9a08dbcf82c86e4
(Fix for problem with undeclared intptr_t type), which is also merged
fixes the same problem, without causing breakage.
Upstream-Status: Submitted [https://sourceforge.net/p/gnu-efi/code/merge-requests/6/]
Signed-off-by: Esben Haabendal <esben@haabendal.dk>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
inc/efilink.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/inc/efilink.h b/inc/efilink.h
index b69a6fd..cc5aa2d 100644
--- a/inc/efilink.h
+++ b/inc/efilink.h
@@ -1,10 +1,6 @@
#ifndef _EFI_LINK_H
#define _EFI_LINK_H
-#if defined(__GNUC__)
-#include <stdint.h>
-#endif
-
/*++
Copyright (c) 1998 Intel Corporation
--
2.20.1
@@ -19,25 +19,7 @@ Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
[Rebased for 3.0.8]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
gnuefi/Makefile | 3 ++-
lib/Makefile | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnuefi/Makefile b/gnuefi/Makefile
index 2a61699..89b560a 100644
--- a/gnuefi/Makefile
+++ b/gnuefi/Makefile
@@ -54,7 +54,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a
all: $(TARGETS)
-libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
+libgnuefi.a: $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
clean:
rm -f $(TARGETS) *~ *.o $(OBJS)
diff --git a/lib/Makefile b/lib/Makefile
index 0e6410d..048751a 100644
--- a/lib/Makefile
@@ -16,10 +16,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
file://parallel-make-archives.patch \
file://lib-Makefile-fix-parallel-issue.patch \
file://gnu-efi-3.0.9-fix-clang-build.patch \
file://0001-Revert-efilink-fix-build-with-gcc-4.8.patch \
"
SRC_URI[md5sum] = "32af17b917545a693e549af2439c4a99"
SRC_URI[sha256sum] = "6715ea7eae1c7e4fc5041034bd3f107ec2911962ed284a081e491646b12277f0"
SRC_URI[md5sum] = "960a8379b6f95ee73d7778b70bf2a089"
SRC_URI[sha256sum] = "f12082a3a5f0c3e38c67262a9f34245d139ac2cdfc0a0bdcf03c9b1f56fa4fed"
COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
COMPATIBLE_HOST_armv4 = 'null'