From: Ross Burton <ross.burton@arm.com>
Date: Fri, 29 Nov 2024 17:38:01 +0000 (+0000)
Subject: gnu-efi: remove obsolete patch
X-Git-Tag: yocto-5.2~1126
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd80af9abce3547f7e929e592bababd3c736bcee;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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 3c11baca0c5..00000000000
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Fix-parallel-make-failure-for-archives.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 70e30774debb9ab5d53a29c183f86fc569661b7c Mon Sep 17 00:00:00 2001
-From: Saul Wold <sgw@linux.intel.com>
-Date: Sun, 9 Mar 2014 15:22:15 +0200
-Subject: [PATCH] Fix parallel make failure for archives
-
-Upstream-Status: Pending
-
-The lib and gnuefi makefiles were using the lib.a() form which compiles
-and ar's as a pair instead of compiling all and then ar'ing which can
-parallelize better. This was resulting in build failures on larger values
-of -j.
-
-See http://www.chemie.fu-berlin.de/chemnet/use/info/make/make_toc.html#TOC105
-for details.
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-[Rebased for 3.0.6]
-Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
-[Rebased for 3.0.8]
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- lib/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index ec1f9e3..79a794d 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -75,7 +75,7 @@ libsubdirs:
- $(OBJS): libsubdirs
- 
- libefi.a: $(OBJS)
--	$(AR) $(ARFLAGS) $@ $^
-+	$(AR) $(ARFLAGS) $@ $(OBJS)
- 
- clean:
- 	@rm -vf libefi.a *~ $(OBJS) */*.o
--- 
-2.25.1
-
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 092e7ed863f..b08aede69f2 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
                    "
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/files/${BP}.tar.bz2 \
-           file://0001-Fix-parallel-make-failure-for-archives.patch \
            file://0002-Do-not-treat-warnings-as-errors.patch \
            "
 SRC_URI[sha256sum] = "7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c"