diff options
Diffstat (limited to 'meta/recipes-bsp/gnu-efi/gnu-efi')
-rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi/0001-Revert-efilink-fix-build-with-gcc-4.8.patch | 38 | ||||
-rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch | 18 |
2 files changed, 38 insertions, 18 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Revert-efilink-fix-build-with-gcc-4.8.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Revert-efilink-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..8ab25113a4 --- /dev/null +++ b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Revert-efilink-fix-build-with-gcc-4.8.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 1f7b2e5bd6603b30202a66b6317a41e2be85742b Mon Sep 17 00:00:00 2001 | ||
2 | From: Esben Haabendal <esben@haabendal.dk> | ||
3 | Date: Tue, 26 Mar 2019 13:37:02 +0100 | ||
4 | Subject: Revert "efilink: fix build with gcc 4.8" | ||
5 | |||
6 | This reverts commit 6335e5c697c57d8b5854b8202de3733bcb151ca6, as it breaks | ||
7 | gcc builds with '-nostdinc' flag. | ||
8 | |||
9 | The fix in 1a53d8f88a452847b25f9689f9a08dbcf82c86e4 | ||
10 | (Fix for problem with undeclared intptr_t type), which is also merged | ||
11 | fixes the same problem, without causing breakage. | ||
12 | |||
13 | Upstream-Status: Submitted [https://sourceforge.net/p/gnu-efi/code/merge-requests/6/] | ||
14 | |||
15 | Signed-off-by: Esben Haabendal <esben@haabendal.dk> | ||
16 | Signed-off-by: Adrian Bunk <bunk@stusta.de> | ||
17 | --- | ||
18 | inc/efilink.h | 4 ---- | ||
19 | 1 file changed, 4 deletions(-) | ||
20 | |||
21 | diff --git a/inc/efilink.h b/inc/efilink.h | ||
22 | index b69a6fd..cc5aa2d 100644 | ||
23 | --- a/inc/efilink.h | ||
24 | +++ b/inc/efilink.h | ||
25 | @@ -1,10 +1,6 @@ | ||
26 | #ifndef _EFI_LINK_H | ||
27 | #define _EFI_LINK_H | ||
28 | |||
29 | -#if defined(__GNUC__) | ||
30 | -#include <stdint.h> | ||
31 | -#endif | ||
32 | - | ||
33 | /*++ | ||
34 | |||
35 | Copyright (c) 1998 Intel Corporation | ||
36 | -- | ||
37 | 2.20.1 | ||
38 | |||
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch index a9806cfdf6..8a0138bbe5 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch +++ b/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch | |||
@@ -19,25 +19,7 @@ Signed-off-by: Darren Hart <dvhart@linux.intel.com> | |||
19 | Signed-off-by: California Sullivan <california.l.sullivan@intel.com> | 19 | Signed-off-by: California Sullivan <california.l.sullivan@intel.com> |
20 | [Rebased for 3.0.8] | 20 | [Rebased for 3.0.8] |
21 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 21 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
22 | --- | ||
23 | gnuefi/Makefile | 3 ++- | ||
24 | lib/Makefile | 2 +- | ||
25 | 2 files changed, 3 insertions(+), 2 deletions(-) | ||
26 | 22 | ||
27 | diff --git a/gnuefi/Makefile b/gnuefi/Makefile | ||
28 | index 2a61699..89b560a 100644 | ||
29 | --- a/gnuefi/Makefile | ||
30 | +++ b/gnuefi/Makefile | ||
31 | @@ -54,7 +54,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a | ||
32 | |||
33 | all: $(TARGETS) | ||
34 | |||
35 | -libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS)) | ||
36 | +libgnuefi.a: $(OBJS) | ||
37 | + $(AR) $(ARFLAGS) $@ $(OBJS) | ||
38 | |||
39 | clean: | ||
40 | rm -f $(TARGETS) *~ *.o $(OBJS) | ||
41 | diff --git a/lib/Makefile b/lib/Makefile | 23 | diff --git a/lib/Makefile b/lib/Makefile |
42 | index 0e6410d..048751a 100644 | 24 | index 0e6410d..048751a 100644 |
43 | --- a/lib/Makefile | 25 | --- a/lib/Makefile |