Skip to contentSkip to conversation

libnl_1.1.bb: Fix the build when libnl2 is staged

PATCH New Khem Raj 1 participant 1 message Sep 22, 2010

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 libnl_1.1.bb: Fix the build when libnl2 is staged

Currently linker would search for libnl in sysroot first before linking in the one thats build with libnl this patch directs ld to link in with the one thats build and not look for the one in sysroot.

As a result we can compile libnl and libnl2 alongside

---
 .../libnl/files/dont-link-libnl-from-sysroot.patch |   26 ++++++++++++++++++++
 recipes/libnl/libnl_1.1.bb                         |    6 +---
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 recipes/libnl/files/dont-link-libnl-from-sysroot.patch
recipes/libnl/files/dont-link-libnl-from-sysroot.patch new file +26 -0
new file mode 100644
index 0000000..beb6361
@@ -0,0 +1,26 @@
+Index: libnl-1.1/src/Makefile
+===================================================================
+--- libnl-1.1.orig/src/Makefile	2008-01-14 07:48:45.000000000 -0800
++++ libnl-1.1/src/Makefile	2010-09-22 14:58:46.820826001 -0700
+@@ -13,7 +13,7 @@ ifeq ($(shell [ ! -r ../Makefile.opts ]
+     include ../Makefile.opts
+ endif
+ 
+-LDFLAGS	+= -L../lib -lnl utils.o
++LDFLAGS	+= ../lib/libnl.so utils.o
+ CIN 	:= $(wildcard nl-*.c) $(wildcard genl-*.c) $(wildcard nf-*.c)
+ TOOLS	:= $(CIN:%.c=%)
+ 
+Index: libnl-1.1/tests/Makefile
+===================================================================
+--- libnl-1.1.orig/tests/Makefile	2008-01-14 07:48:45.000000000 -0800
++++ libnl-1.1/tests/Makefile	2010-09-22 14:58:46.820826001 -0700
+@@ -13,7 +13,7 @@ ifeq ($(shell [ ! -r ../Makefile.opts ]
+     include ../Makefile.opts
+ endif
+ 
+-LDFLAGS	+= -L../lib -lnl ../src/utils.o
++LDFLAGS	+= ../lib/libnl.so ../src/utils.o
+ CIN 	:= $(wildcard test-*.c)
+ TOOLS	:= $(CIN:%.c=%)
+ 
recipes/libnl/libnl_1.1.bb +2 -4
index 06059ca..f1b2a9d 100644
@@ -3,10 +3,7 @@ SECTION = "libs/network"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
 
-# If you get errors like : undefined reference to `nl_handle_alloc
-# do a bitbake -c clean libnl2
-
-PR = "r3"
+PR = "r4"
 
 inherit autotools pkgconfig
 
@@ -18,6 +15,7 @@ SRC_URI = "\
   file://fix-includes.patch \
   file://respect-ldflags.patch \
   file://netlink-local-fix.patch \
+  file://dont-link-libnl-from-sysroot.patch \
 "
 
 
Signature · 1 line
1.7.1