diff options
| author |   Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2011-11-07 19:59:54 +0000 |
|---|---|---|
| committer | Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2011-11-07 19:59:54 +0000 |
| commit | aecd8025949db6374460dd4ab58548a29e786bac (patch) | |
| tree | 63cdbbf5929d627f6aa6097e9e180aa98e51a3d3 | |
| parent | Allowing compiling against both libnl-1.1 and libnl-3 (diff) | |
| download | gentoo-2-aecd8025949db6374460dd4ab58548a29e786bac.tar.gz gentoo-2-aecd8025949db6374460dd4ab58548a29e786bac.tar.bz2 gentoo-2-aecd8025949db6374460dd4ab58548a29e786bac.zip | |
Fixing bug 388991
(Portage version: 2.2.0_alpha72/cvs/Linux i686)
| -rw-r--r-- | net-wireless/crda/ChangeLog | 5 | ||||
| -rw-r--r-- | net-wireless/crda/files/libnl31-support.diff | 20 |
2 files changed, 15 insertions, 10 deletions
diff --git a/net-wireless/crda/ChangeLog b/net-wireless/crda/ChangeLog index edb207ad71c7..14ee0bb48e9e 100644 --- a/net-wireless/crda/ChangeLog +++ b/net-wireless/crda/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-wireless/crda # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.27 2011/10/30 16:47:07 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.28 2011/11/07 19:59:53 gurligebis Exp $ + + 07 Nov 2011; <gurligebis@gentoo.org> files/libnl31-support.diff: + Updated patch with patch from bug #388991 30 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> crda-1.1.2.ebuild: Fix filename in epatch -line wrt #388991 diff --git a/net-wireless/crda/files/libnl31-support.diff b/net-wireless/crda/files/libnl31-support.diff index caa28997096f..56243ee9c697 100644 --- a/net-wireless/crda/files/libnl31-support.diff +++ b/net-wireless/crda/files/libnl31-support.diff @@ -1,6 +1,6 @@ -diff -aurp a/crda.c b/crda.c ---- a/crda.c 2011-09-09 23:36:23.742094512 +0000 -+++ b/crda.c 2011-09-09 23:36:02.109096391 +0000 +diff -aurp a/crda-1.1.2/crda.c b/crda-1.1.2/crda.c +--- a/crda-1.1.2/crda.c 2011-11-07 19:52:28.884873650 +0000 ++++ b/crda-1.1.2/crda.c 2011-11-07 19:53:30.501874372 +0000 @@ -21,7 +21,7 @@ #include "regdb.h" #include "reglib.h" @@ -19,9 +19,9 @@ diff -aurp a/crda.c b/crda.c struct nl80211_state { struct nl_sock *nl_sock; -diff -aurp a/Makefile b/Makefile ---- a/Makefile 2011-09-09 23:36:23.743094561 +0000 -+++ b/Makefile 2011-09-09 23:36:02.109096391 +0000 +diff -aurp a/crda-1.1.2/Makefile b/crda-1.1.2/Makefile +--- a/crda-1.1.2/Makefile 2011-11-07 19:52:28.884873650 +0000 ++++ b/crda-1.1.2/Makefile 2011-11-07 19:54:25.906872386 +0000 @@ -48,19 +48,26 @@ INSTALL ?= install NL1FOUND := $(shell pkg-config --atleast-version=1 libnl-1 && echo Y) NL2FOUND := $(shell pkg-config --atleast-version=2 libnl-2.0 && echo Y) @@ -31,16 +31,18 @@ diff -aurp a/Makefile b/Makefile -ifeq ($(NL3FOUND),Y) +ifeq ($(NL31FOUND),Y) CFLAGS += -DCONFIG_LIBNL30 - NLLIBS += -lnl-genl +-NLLIBS += -lnl-genl -NLLIBNAME = libnl-3.0 ++NLLIBS += $(shell pkg-config --libs libnl-genl-3.1) +NLLIBNAME = libnl-3.1 else - ifeq ($(NL2FOUND),Y) - CFLAGS += -DCONFIG_LIBNL20 +- NLLIBS += -lnl-genl +- NLLIBNAME = libnl-2.0 + ifeq ($(NL3FOUND),Y) + CFLAGS += -DCONFIG_LIBNL30 - NLLIBS += -lnl-genl -- NLLIBNAME = libnl-2.0 ++ NLLIBS += $(shell pkg-config --libs libnl-genl-3.0) + NLLIBNAME = libnl-3.0 else - ifeq ($(NL1FOUND),Y) |