From 562f9f544fd91fa8f77d7f6fac9220d65f68e098 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 15 Feb 2024 15:16:13 +0100
Subject: [PATCH] gnu-efi-libs: update to 3.0.17.

---
 srcpkgs/gnu-efi-libs/patches/no-werror.patch | 18 +++++++-----------
 srcpkgs/gnu-efi-libs/template                |  7 +++++--
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/gnu-efi-libs/patches/no-werror.patch b/srcpkgs/gnu-efi-libs/patches/no-werror.patch
index f6cc95bdccf..8d91760ded5 100644
--- a/srcpkgs/gnu-efi-libs/patches/no-werror.patch
+++ b/srcpkgs/gnu-efi-libs/patches/no-werror.patch
@@ -1,20 +1,16 @@
-Source: Alpine Linux (adapted)
-Upstream: No
-Reason: Fixes compilation on i686
-
 --- a/Make.defaults
 +++ b/Make.defaults
-@@ -156,11 +156,11 @@ ifneq (mingw32,$(findstring mingw32, $(GCCMACHINE)))
+@@ -183,11 +183,11 @@ ifneq (mingw32,$(findstring mingw32, $(GCCMACHINE)))
  endif
  
  ifeq (FreeBSD, $(findstring FreeBSD, $(OS)))
 -CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
 +CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra \
-            -fshort-wchar -fno-strict-aliasing \
+            -funsigned-char -fshort-wchar -fno-strict-aliasing \
             -ffreestanding -fno-stack-protector
  else
--CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
-+CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra \
-            -fshort-wchar -fno-strict-aliasing \
-            -fno-merge-all-constants -ffreestanding -fno-stack-protector \
-            -fno-stack-check
+-CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Wno-pointer-sign -Werror \
++CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Wno-pointer-sign \
+            -funsigned-char -fshort-wchar -fno-strict-aliasing \
+ 	   -ffreestanding -fno-stack-protector -fno-stack-check \
+            -fno-stack-check \
diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template
index 8e5b09f2cd2..2f088744633 100644
--- a/srcpkgs/gnu-efi-libs/template
+++ b/srcpkgs/gnu-efi-libs/template
@@ -1,7 +1,7 @@
 # Template file for 'gnu-efi-libs'
 pkgname=gnu-efi-libs
 reverts="3.0w_1" # Not an actual revert, xbps considers 3.0w higher than 3.0.8
-version=3.0.14
+version=3.0.17
 revision=1
 makedepends="pciutils-devel"
 short_desc="Library for building UEFI Applications using GNU toolchain"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/gnu-efi/"
 distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2"
-checksum=b73b643a0d5697d1f396d7431448e886dd805668789578e3e1a28277c9528435
+checksum=7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4
 nostrip=yes
 
 # If we are cross-building we need to pass the cross-compilation triplet
@@ -41,6 +41,9 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 do_build() {
+	# upstream provides LDFLAGS directly to ld: https://sourceforge.net/p/gnu-efi/bugs/33/
+	LDFLAGS="${LDFLAGS//-Wl/}"
+	LDFLAGS="${LDFLAGS//,/ }"
 	make ARCH=${TARGET_ARCH} HOSTARCH=${HOST_ARCH}
 }