public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-wireless/crda/files: crda-3.18-libreg-link.patch
@ 2015-03-08  3:32 Mike Frysinger (vapier)
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2015-03-08  3:32 UTC (permalink / raw
  To: gentoo-commits

vapier      15/03/08 03:32:24

  Added:                crda-3.18-libreg-link.patch
  Log:
  Fix libreg linkage #542436 by Rémi Cardona.
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.1                  net-wireless/crda/files/crda-3.18-libreg-link.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/crda/files/crda-3.18-libreg-link.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/crda/files/crda-3.18-libreg-link.patch?rev=1.1&content-type=text/plain

Index: crda-3.18-libreg-link.patch
===================================================================
https://bugs.gentoo.org/542436

From f56ab87b25f2228a67ac592a1c18793c72dd03eb Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 7 Mar 2015 22:29:33 -0500
Subject: [PATCH crda] libreg: link against crypto libs

Since libreg uses funcs from the crypto lib, make sure we link them.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8e345a1..77708e6 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
 
 $(LIBREG): regdb.h reglib.h reglib.c
 	$(NQ) '  CC  ' $@
-	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^
+	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LDLIBS)
 
 install-libreg-headers:
 	$(NQ) '  INSTALL  libreg-headers'
-- 
2.3.1






^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-wireless/crda/files: crda-3.18-libreg-link.patch
@ 2015-03-09 22:12 Mike Frysinger (vapier)
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2015-03-09 22:12 UTC (permalink / raw
  To: gentoo-commits

vapier      15/03/09 22:12:45

  Modified:             crda-3.18-libreg-link.patch
  Log:
  Fix libreg linkage to not link against itself #542436#2 by Ilya Konovalov.
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.2                  net-wireless/crda/files/crda-3.18-libreg-link.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/crda/files/crda-3.18-libreg-link.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/crda/files/crda-3.18-libreg-link.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/crda/files/crda-3.18-libreg-link.patch?r1=1.1&r2=1.2

Index: crda-3.18-libreg-link.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/crda/files/crda-3.18-libreg-link.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crda-3.18-libreg-link.patch	8 Mar 2015 03:32:24 -0000	1.1
+++ crda-3.18-libreg-link.patch	9 Mar 2015 22:12:45 -0000	1.2
@@ -21,7 +21,7 @@
  $(LIBREG): regdb.h reglib.h reglib.c
  	$(NQ) '  CC  ' $@
 -	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^
-+	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LDLIBS)
++	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(filter-out -lreg,$(LDLIBS))
  
  install-libreg-headers:
  	$(NQ) '  INSTALL  libreg-headers'





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-03-09 22:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-08  3:32 [gentoo-commits] gentoo-x86 commit in net-wireless/crda/files: crda-3.18-libreg-link.patch Mike Frysinger (vapier)
  -- strict thread matches above, loose matches on Subject: below --
2015-03-09 22:12 Mike Frysinger (vapier)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox