3 files changed, 7 insertions, 42 deletions
diff --git a/devel/gnu-efi/files/patch-Make.defaults b/devel/gnu-efi/files/patch-Make.defaults
index 68fcca4b0c84..8d0d6b7ee7a7 100644
--- a/devel/gnu-efi/files/patch-Make.defaults
+++ b/devel/gnu-efi/files/patch-Make.defaults
@@ -1,14 +1,8 @@
---- Make.defaults.orig	2019-10-28 11:48:52 UTC
+--- Make.defaults.orig	2024-03-22 13:38:35 UTC
 +++ Make.defaults
-@@ -45,11 +45,14 @@ TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PW
- # Where to install the package. GNU-EFI will create and access
- # lib and include under the root
- #
--INSTALLROOT  := /
-+INSTALLROOT  := $(DESTDIR)
- PREFIX       := /usr/local
- LIBDIR 	     := $(PREFIX)/lib
- INSTALL	     := install
+@@ -64,6 +64,9 @@ INSTALL	 := install
+ INCLUDEDIR   := $(PREFIX)/include
+ INSTALL	 := install
  
 +LOCALBASE    := /usr/local
 +CROSS_COMPILE:= $(LOCALBASE)/bin/
@@ -16,21 +10,3 @@
  # Compilation tools
  HOSTCC       := $(prefix)gcc
  CC           := $(prefix)$(CROSS_COMPILE)gcc
-@@ -110,10 +113,14 @@ ifeq ($(ARCH),x86_64)
-                             || ( [ $(GCCVERSION) -eq "4" ]      \
-                                  && [ $(GCCMINOR) -ge "7" ] ) ) \
-                           && echo 1)
--  ifeq ($(GCCNEWENOUGH),1)
--    CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
--  else ifeq ($(USING_CLANG),clang)
-+  ifeq ($(USING_CLANG),clang)
-     CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11
-+  else
-+    ifeq ($(GCCNEWENOUGH),1)
-+      CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
-+    else
-+      CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11
-+    endif
-   endif
- 
-   CFLAGS += -mno-red-zone
diff --git a/devel/gnu-efi/files/patch-Makefile b/devel/gnu-efi/files/patch-Makefile
index 5800b4eb1fb9..a454e34ba2a5 100644
--- a/devel/gnu-efi/files/patch-Makefile
+++ b/devel/gnu-efi/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig	2015-08-17 20:06:47 UTC
+--- Makefile.orig	2024-03-22 13:38:35 UTC
 +++ Makefile
-@@ -42,7 +42,7 @@ VPATH = $(SRCDIR)
+@@ -43,7 +43,7 @@ include $(SRCDIR)/Make.defaults
  
  include $(SRCDIR)/Make.defaults
  
 -SUBDIRS = lib gnuefi inc apps
 +SUBDIRS = lib gnuefi inc
- gnuefi: lib
  
  all:	check_gcc $(SUBDIRS)
+ 
diff --git a/devel/gnu-efi/files/patch-gnuefi-Makefile b/devel/gnu-efi/files/patch-gnuefi-Makefile
deleted file mode 100644
index 92b199fce135..000000000000
--- a/devel/gnu-efi/files/patch-gnuefi-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnuefi/Makefile.orig	2015-08-17 20:06:47 UTC
-+++ gnuefi/Makefile
-@@ -47,6 +47,8 @@ FILES	= reloc_$(ARCH)  
- 
- OBJS	= $(FILES:%=%.o)
- 
-+CFLAGS += -fPIC
-+
- # on aarch64, avoid jump tables before all relocations have been processed
- reloc_aarch64.o: CFLAGS += -fno-jump-tables
-