Revision: 6211
http://ipcop.svn.sourceforge.net/ipcop/?rev=6211&view=rev
Author: owes
Date: 2012-01-04 08:52:24 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
Patch iw Makefile.
Added Paths:
-----------
ipcop/trunk/src/patches/iw-3.2_libnl32.patch
Added: ipcop/trunk/src/patches/iw-3.2_libnl32.patch
===================================================================
--- ipcop/trunk/src/patches/iw-3.2_libnl32.patch
(rev 0)
+++ ipcop/trunk/src/patches/iw-3.2_libnl32.patch 2012-01-04 08:52:24 UTC
(rev 6211)
@@ -0,0 +1,64 @@
+Makefile patches from upstream git to compile with libnl-3.2
+
+--- a/Makefile 2011-11-04 11:53:29.000000000 +0100
++++ b/Makefile 2012-01-03 16:24:04.000000000 +0100
+@@ -25,6 +25,8 @@
+ NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
+ NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y)
+ NL3FOUND := $(shell $(PKG_CONFIG) --atleast-version=3 libnl-3.0 && echo Y)
++NL31FOUND := $(shell $(PKG_CONFIG) --exact-version=3.1 libnl-3.1 && echo Y)
++NL3xFOUND := $(shell $(PKG_CONFIG) --atleast-version=3.2 libnl-3.0 && echo Y)
+
+ ifeq ($(NL1FOUND),Y)
+ NLLIBNAME = libnl-1
+@@ -36,12 +38,28 @@
+ NLLIBNAME = libnl-2.0
+ endif
+
++ifeq ($(NL3xFOUND),Y)
++# libnl 3.2 might be found as 3.2 and 3.0
++NL3FOUND = N
++CFLAGS += -DCONFIG_LIBNL30
++LIBS += -lnl-genl-3
++NLLIBNAME = libnl-3.0
++endif
++
+ ifeq ($(NL3FOUND),Y)
+ CFLAGS += -DCONFIG_LIBNL30
+ LIBS += -lnl-genl
+ NLLIBNAME = libnl-3.0
+ endif
+
++# nl-3.1 has a broken libnl-gnl-3.1.pc file
++# as show by pkg-config --debug --libs --cflags --exact-version=3.1
libnl-genl-3.1;echo $?
++ifeq ($(NL31FOUND),Y)
++CFLAGS += -DCONFIG_LIBNL30
++LIBS += -lnl-genl
++NLLIBNAME = libnl-3.1
++endif
++
+ ifeq ($(NLLIBNAME),)
+ $(error Cannot find development files for any supported version of libnl)
+ endif
+@@ -57,20 +75,7 @@
+ NQ=echo
+ endif
+
+-all: version_check $(ALL)
+-
+-version_check:
+-ifeq ($(NL3FOUND),Y)
+-else
+-ifeq ($(NL2FOUND),Y)
+-else
+-ifeq ($(NL1FOUND),Y)
+-else
+- $(error No libnl found)
+-endif
+-endif
+-endif
+-
++all: $(ALL)
+
+ VERSION_OBJS := $(filter-out version.o, $(OBJS))
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
