commit:     17f4add4b38825117a0661f1d151dfadffe4e7f6
Author:     James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Fri Oct 15 23:46:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 16 01:27:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f4add4

net-wireless/crda: update ldflags patch to fix Clang build

Closes: https://bugs.gentoo.org/596352
Signed-off-by: James Beddek <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/22594
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-wireless/crda/files/crda-ldflags.patch | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/net-wireless/crda/files/crda-ldflags.patch 
b/net-wireless/crda/files/crda-ldflags.patch
index 5ba9165c7ad..13592127e92 100644
--- a/net-wireless/crda/files/crda-ldflags.patch
+++ b/net-wireless/crda/files/crda-ldflags.patch
@@ -1,11 +1,18 @@
---- /Makefile
-+++ /Makefile
-@@ -115,7 +115,7 @@
+# 
https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/patch/?id=9856751feaf7b102547cea678a5da6c94252d83d
+# https://bugs.gentoo.org/678450
+# https://bugs.gentoo.org/596352
+
+--- a/Makefile
++++ b/Makefile
+@@ -114,9 +114,9 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
+       $(NQ) '  Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem)
+       $(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
  
- $(LIBREG): regdb.h reglib.h reglib.c
+-$(LIBREG): regdb.h reglib.h reglib.c
++$(LIBREG): reglib.c regdb.h reglib.h
        $(NQ) '  CC  ' $@
 -      $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ 
$(filter-out -lreg,$(LDLIBS))
-+      $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -shared 
-Wl,-soname,$(LIBREG) $^ $(filter-out -lreg,$(LDLIBS))
++      $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -shared 
-Wl,-soname,$(LIBREG) $< $(filter-out -lreg,$(LDLIBS))
  
  install-libreg-headers:
        $(NQ) '  INSTALL  libreg-headers'

Reply via email to