diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2011-03-18 14:12:14 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-03-24 11:18:16 +0100 |
| commit | 5ef679ab9130fdb1818d1827089c18b04ed5e7c6 (patch) | |
| tree | 15a56ad04c44ed2aa7cee09bf41b930aa2839217 /recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch | |
| parent | fb0a796b1fc6612168a187a2883fc7b5cd9d1240 (diff) | |
| download | openembedded-5ef679ab9130fdb1818d1827089c18b04ed5e7c6.tar.gz | |
libnl: rename libnl2 to libnl as used in openembedded-core
* libnl1/libnl2 still conflicts even when using separate includedir so
it will be easier for distro maintainers to use only libnl1 or libnl2
by PREFERRED_VERSION
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch')
| -rw-r--r-- | recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch b/recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch new file mode 100644 index 0000000000..beb63617ac --- /dev/null +++ b/recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch @@ -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=%) + |