[gentoo-commits] repo/gentoo:master commit in: sys-libs/efivar/files/

["Sam James" <sam@gentoo.org>]

commit:     e54d1e325411a252c0c267c63cb51c7ead227631
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 04:06:14 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 04:06:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e54d1e32

sys-libs/efivar: adjust ia64-relro patch

Some extra fatal warning bits snuck in upstream, it looks like.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/efivar/files/efivar-38-ia64-relro.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sys-libs/efivar/files/efivar-38-ia64-relro.patch b/sys-libs/efivar/files/efivar-38-ia64-relro.patch
index 2f3686cac444..e90736a0394b 100644
--- a/sys-libs/efivar/files/efivar-38-ia64-relro.patch
+++ b/sys-libs/efivar/files/efivar-38-ia64-relro.patch
@@ -23,6 +23,8 @@ The change drops `--fatal-warnings` option from gcc.spec entirely.
 
 Rejected upstream in https://github.com/rhboot/efivar/pull/164.
 
+[sam: add extra hunk to fix 38 build.]
+
 Reported-by: Émeric Maschino
 Bug: https://bugs.gentoo.org/749963
 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
@@ -43,3 +45,16 @@ index ef28e2b..4deead5 100644
 -- 
 2.34.1
 
+diff --git a/src/include/defaults.mk b/src/include/defaults.mk
+index 9024a3a..f5515fa 100644
+--- a/src/include/defaults.mk
++++ b/src/include/defaults.mk
+@@ -58,7 +58,7 @@ override LDFLAGS = $(CFLAGS) -L. $(_LDFLAGS) $(_CCLDFLAGS) \
+ 		   -Wl,-z,now \
+ 		   -Wl,-z,muldefs \
+ 		   -Wl,-z,relro \
+-		   -Wl,--fatal-warnings \
++		   -Wl,--no-fatal-warnings \
+ 		   $(call family,LDFLAGS) $(call family,CCLDFLAGS) \
+ 		   $(call pkg-config-ccldflags)
+ override CCLDFLAGS = $(LDFLAGS)