[oe-commits] Sergey Lapin : libnl build fix

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 2a50d925239d80b70dc0c74c5809a8c4ebf12a8e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2a50d925239d80b70dc0c74c5809a8c4ebf12a8e

Author: Sergey Lapin <slapin at ossfans.org>
Date:   Fri Jan 30 10:58:31 2009 +0300

libnl build fix

Signed-off-by: Sergey Lapin <slapin at ossfans.org>

---

 packages/libnl/files/fix-includes.patch |   13 +++++++++++++
 packages/libnl/libnl_1.1.bb             |    2 ++
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/packages/libnl/files/fix-includes.patch b/packages/libnl/files/fix-includes.patch
new file mode 100644
index 0000000..b172fd2
--- /dev/null
+++ b/packages/libnl/files/fix-includes.patch
@@ -0,0 +1,13 @@
+diff -ruN libnl-1.1/lib/route/link/vlan.c libnl-1.1-new/lib/route/link/vlan.c
+--- libnl-1.1/lib/route/link/vlan.c	2008-01-14 18:48:45.000000000 +0300
++++ libnl-1.1-new/lib/route/link/vlan.c	2009-01-30 10:55:09.000000000 +0300
+@@ -26,7 +26,9 @@
+ #include <netlink/route/link/info-api.h>
+ #include <netlink/route/link/vlan.h>
+ 
++#ifndef VLAN_FLAG_REORDER_HDR
+ #include <linux/if_vlan.h>
++#endif
+ 
+ /** @cond SKIP */
+ #define VLAN_HAS_ID		(1<<0)
diff --git a/packages/libnl/libnl_1.1.bb b/packages/libnl/libnl_1.1.bb
index 51f4c43..dcca3c6 100644
--- a/packages/libnl/libnl_1.1.bb
+++ b/packages/libnl/libnl_1.1.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "libnl is a library for applications dealing with netlink sockets"
 SECTION = "libs/network"
 LICENSE = "LGPL"
 HOMEPAGE = "http://people.suug.ch/~tgr/libnl"
+PR = "r1"
 
 inherit autotools pkgconfig
 
@@ -10,6 +11,7 @@ CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1'
 SRC_URI = "\
   http://people.suug.ch/~tgr/libnl/files/libnl-${PV}.tar.gz \
   file://local-includes-and-avoid-wrong-ldflags.patch;patch=1 \
+  file://fix-includes.patch;patch=1 \
 "
 
 do_stage () {