summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2024-11-29 17:38:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-11-29 22:13:25 +0000
commit08d004cdc4f2796efa9cfa986f85e058e70d99fe (patch)
treefc267bb69448d0c2b1696623b1ca7e976350a545 /meta
parent1e34a24ff5a789b131800948a069f6d2b010529f (diff)
downloadpoky-08d004cdc4f2796efa9cfa986f85e058e70d99fe.tar.gz
gnu-efi: remove obsolete patch
The original patch in 2013[1] did this: +-libefi.a: libefi.a($(OBJS)) ++libefi.a: $(OBJS) The Makefile no longer uses this syntax and simply replacing $^ with $(OBJS) is a no-op, so this patch isn't needed. [1] meta-intel c2c13d4dba2d9c70862891adf0b250ce2be65f68 (From OE-Core rev: fd80af9abce3547f7e929e592bababd3c736bcee) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi/0001-Fix-parallel-make-failure-for-archives.patch41
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb1
2 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Fix-parallel-make-failure-for-archives.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Fix-parallel-make-failure-for-archives.patch
deleted file mode 100644
index 3c11baca0c..0000000000
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Fix-parallel-make-failure-for-archives.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 70e30774debb9ab5d53a29c183f86fc569661b7c Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com>
3Date: Sun, 9 Mar 2014 15:22:15 +0200
4Subject: [PATCH] Fix parallel make failure for archives
5
6Upstream-Status: Pending
7
8The lib and gnuefi makefiles were using the lib.a() form which compiles
9and ar's as a pair instead of compiling all and then ar'ing which can
10parallelize better. This was resulting in build failures on larger values
11of -j.
12
13See http://www.chemie.fu-berlin.de/chemnet/use/info/make/make_toc.html#TOC105
14for details.
15
16Signed-off-by: Saul Wold <sgw@linux.intel.com>
17Signed-off-by: Darren Hart <dvhart@linux.intel.com>
18[Rebased for 3.0.6]
19Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
20[Rebased for 3.0.8]
21Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
22---
23 lib/Makefile | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --git a/lib/Makefile b/lib/Makefile
27index ec1f9e3..79a794d 100644
28--- a/lib/Makefile
29+++ b/lib/Makefile
30@@ -75,7 +75,7 @@ libsubdirs:
31 $(OBJS): libsubdirs
32
33 libefi.a: $(OBJS)
34- $(AR) $(ARFLAGS) $@ $^
35+ $(AR) $(ARFLAGS) $@ $(OBJS)
36
37 clean:
38 @rm -vf libefi.a *~ $(OBJS) */*.o
39--
402.25.1
41
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb
index 092e7ed863..b08aede69f 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb
@@ -13,7 +13,6 @@ LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=16;md5=e582
13 " 13 "
14 14
15SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/files/${BP}.tar.bz2 \ 15SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/files/${BP}.tar.bz2 \
16 file://0001-Fix-parallel-make-failure-for-archives.patch \
17 file://0002-Do-not-treat-warnings-as-errors.patch \ 16 file://0002-Do-not-treat-warnings-as-errors.patch \
18 " 17 "
19SRC_URI[sha256sum] = "7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c" 18SRC_URI[sha256sum] = "7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c"