From 16d77671042800b140eca093fe0ed52511790356 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Fri, 4 Sep 2009 10:37:13 +0100
Subject: libnl: Fix compile header problems

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/libnl/files/local-includes.patch | 11 -----------
 meta/packages/libnl/libnl/compilefix.patch     | 12 ++++++++++++
 meta/packages/libnl/libnl/local-includes.patch | 11 +++++++++++
 meta/packages/libnl/libnl_1.1.bb               |  8 ++++----
 4 files changed, 27 insertions(+), 15 deletions(-)
 delete mode 100644 meta/packages/libnl/files/local-includes.patch
 create mode 100644 meta/packages/libnl/libnl/compilefix.patch
 create mode 100644 meta/packages/libnl/libnl/local-includes.patch

(limited to 'meta/packages')

diff --git a/meta/packages/libnl/files/local-includes.patch b/meta/packages/libnl/files/local-includes.patch
deleted file mode 100644
index 5af463004b..0000000000
--- a/meta/packages/libnl/files/local-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libnl-1.0-pre6/Makefile.opts.in.orig	2006-08-24 14:57:42.000000000 +0200
-+++ libnl-1.0-pre6/Makefile.opts.in	2006-08-24 14:58:20.000000000 +0200
-@@ -10,7 +10,7 @@
- #
- 
- CC               := @CC@
--CFLAGS           := @CFLAGS@
-+CFLAGS           := -I./include -I. -I../include @CFLAGS@
- LDFLAGS          := @LDFLAGS@
- CPPFLAGS         := @CPPFLAGS@
- PACKAGE_NAME     := @PACKAGE_NAME@
diff --git a/meta/packages/libnl/libnl/compilefix.patch b/meta/packages/libnl/libnl/compilefix.patch
new file mode 100644
index 0000000000..f75ff282af
--- /dev/null
+++ b/meta/packages/libnl/libnl/compilefix.patch
@@ -0,0 +1,12 @@
+Index: libnl-1.1/include/netlink-local.h
+===================================================================
+--- libnl-1.1.orig/include/netlink-local.h	2009-09-04 10:10:09.000000000 +0100
++++ libnl-1.1/include/netlink-local.h	2009-09-04 10:10:15.000000000 +0100
+@@ -26,6 +26,7 @@
+ #include <sys/socket.h>
+ #include <inttypes.h>
+ #include <assert.h>
++#include <limits.h>
+ 
+ #include <arpa/inet.h>
+ #include <netdb.h>
diff --git a/meta/packages/libnl/libnl/local-includes.patch b/meta/packages/libnl/libnl/local-includes.patch
new file mode 100644
index 0000000000..5af463004b
--- /dev/null
+++ b/meta/packages/libnl/libnl/local-includes.patch
@@ -0,0 +1,11 @@
+--- libnl-1.0-pre6/Makefile.opts.in.orig	2006-08-24 14:57:42.000000000 +0200
++++ libnl-1.0-pre6/Makefile.opts.in	2006-08-24 14:58:20.000000000 +0200
+@@ -10,7 +10,7 @@
+ #
+ 
+ CC               := @CC@
+-CFLAGS           := @CFLAGS@
++CFLAGS           := -I./include -I. -I../include @CFLAGS@
+ LDFLAGS          := @LDFLAGS@
+ CPPFLAGS         := @CPPFLAGS@
+ PACKAGE_NAME     := @PACKAGE_NAME@
diff --git a/meta/packages/libnl/libnl_1.1.bb b/meta/packages/libnl/libnl_1.1.bb
index 97ac25f733..05c0e32bb2 100644
--- a/meta/packages/libnl/libnl_1.1.bb
+++ b/meta/packages/libnl/libnl_1.1.bb
@@ -3,11 +3,11 @@ SECTION = "libs/network"
 LICENSE = "LGPL"
 HOMEPAGE = "http://people.suug.ch/~tgr/libnl/"
 PRIORITY = "optional"
-PV = "1.1"
 
 inherit autotools_stage pkgconfig
 
-SRC_URI= "http://people.suug.ch/~tgr/libnl/files/${PN}-1.1.tar.gz \
-           file://local-includes.patch;patch=1"
+PR = "r1"
 
-S = "${WORKDIR}/${PN}-1.1"
+SRC_URI= "http://people.suug.ch/~tgr/libnl/files/${PN}-${PV}.tar.gz \
+          file://local-includes.patch;patch=1 \
+          file://compilefix.patch;patch=1"
-- 
cgit v1.2.3-54-g00ecf