summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libnl/libnl/compilefix.patch12
-rw-r--r--meta/recipes-support/libnl/libnl/local-includes.patch11
-rw-r--r--meta/recipes-support/libnl/libnl_2.0.bb (renamed from meta/recipes-support/libnl/libnl_1.1.bb)11
3 files changed, 5 insertions, 29 deletions
diff --git a/meta/recipes-support/libnl/libnl/compilefix.patch b/meta/recipes-support/libnl/libnl/compilefix.patch
deleted file mode 100644
index f75ff282af..0000000000
--- a/meta/recipes-support/libnl/libnl/compilefix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: libnl-1.1/include/netlink-local.h
2===================================================================
3--- libnl-1.1.orig/include/netlink-local.h 2009-09-04 10:10:09.000000000 +0100
4+++ libnl-1.1/include/netlink-local.h 2009-09-04 10:10:15.000000000 +0100
5@@ -26,6 +26,7 @@
6 #include <sys/socket.h>
7 #include <inttypes.h>
8 #include <assert.h>
9+#include <limits.h>
10
11 #include <arpa/inet.h>
12 #include <netdb.h>
diff --git a/meta/recipes-support/libnl/libnl/local-includes.patch b/meta/recipes-support/libnl/libnl/local-includes.patch
deleted file mode 100644
index 5af463004b..0000000000
--- a/meta/recipes-support/libnl/libnl/local-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- libnl-1.0-pre6/Makefile.opts.in.orig 2006-08-24 14:57:42.000000000 +0200
2+++ libnl-1.0-pre6/Makefile.opts.in 2006-08-24 14:58:20.000000000 +0200
3@@ -10,7 +10,7 @@
4 #
5
6 CC := @CC@
7-CFLAGS := @CFLAGS@
8+CFLAGS := -I./include -I. -I../include @CFLAGS@
9 LDFLAGS := @LDFLAGS@
10 CPPFLAGS := @CPPFLAGS@
11 PACKAGE_NAME := @PACKAGE_NAME@
diff --git a/meta/recipes-support/libnl/libnl_1.1.bb b/meta/recipes-support/libnl/libnl_2.0.bb
index 683df9159f..fa96215f0f 100644
--- a/meta/recipes-support/libnl/libnl_1.1.bb
+++ b/meta/recipes-support/libnl/libnl_2.0.bb
@@ -4,13 +4,12 @@ SECTION = "libs/network"
4PRIORITY = "optional" 4PRIORITY = "optional"
5 5
6LICENSE = "LGPLv2.1" 6LICENSE = "LGPLv2.1"
7LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
8 file://src/utils.c;beginline=4;endline=9;md5=6e99dfba5cfd64e92b4eb2c7b31e5e4e"
9 8
10PR = "r1" 9PR = "r0"
11 10
12SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${PN}-${PV}.tar.gz \ 11SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${PN}-${PV}.tar.gz"
13 file://local-includes.patch;apply=yes \
14 file://compilefix.patch;apply=yes"
15 12
16inherit autotools pkgconfig 13inherit autotools pkgconfig
14
15LEAD_SONAME = "libnl.so"