summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-03-09 22:12:45 +0000
committerMike Frysinger <vapier@gentoo.org>2015-03-09 22:12:45 +0000
commit2cf2c02f0fde811ec4e409c4445346f023a59161 (patch)
treefbcb9351b11f3fb74320a4783f6d24b57d4f5e8a /net-wireless
parentfix install (bug #542560) (diff)
downloadgentoo-2-2cf2c02f0fde811ec4e409c4445346f023a59161.tar.gz
gentoo-2-2cf2c02f0fde811ec4e409c4445346f023a59161.tar.bz2
gentoo-2-2cf2c02f0fde811ec4e409c4445346f023a59161.zip
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)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/crda/ChangeLog6
-rw-r--r--net-wireless/crda/files/crda-3.18-libreg-link.patch2
2 files changed, 6 insertions, 2 deletions
diff --git a/net-wireless/crda/ChangeLog b/net-wireless/crda/ChangeLog
index 6de27d14185b..fd343f22fb89 100644
--- a/net-wireless/crda/ChangeLog
+++ b/net-wireless/crda/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-wireless/crda
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.71 2015/03/08 03:32:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.72 2015/03/09 22:12:45 vapier Exp $
+
+ 09 Mar 2015; Mike Frysinger <vapier@gentoo.org>
+ files/crda-3.18-libreg-link.patch:
+ Fix libreg linkage to not link against itself #542436#2 by Ilya Konovalov.
08 Mar 2015; Mike Frysinger <vapier@gentoo.org>
+files/crda-3.18-libreg-link.patch, crda-3.18.ebuild:
diff --git a/net-wireless/crda/files/crda-3.18-libreg-link.patch b/net-wireless/crda/files/crda-3.18-libreg-link.patch
index b5819028ba23..0aa1b6e87a39 100644
--- a/net-wireless/crda/files/crda-3.18-libreg-link.patch
+++ b/net-wireless/crda/files/crda-3.18-libreg-link.patch
@@ -21,7 +21,7 @@ index 8e345a1..77708e6 100644
$(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'