From 9ef8ab59b6bb799dc3e9afea2f3e0daecbcd5f76 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 18 Mar 2011 14:12:14 +0100 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- .../libnl/files/dont-link-libnl-from-sysroot.patch | 26 ---------------------- recipes/libnl/files/fix-includes.patch | 13 ----------- recipes/libnl/files/fix-pc-file.patch | 11 --------- recipes/libnl/files/local-includes.patch | 12 ---------- recipes/libnl/files/netlink-local-fix.patch | 12 ---------- recipes/libnl/files/respect-ldflags.patch | 12 ---------- 6 files changed, 86 deletions(-) delete mode 100644 recipes/libnl/files/dont-link-libnl-from-sysroot.patch delete mode 100644 recipes/libnl/files/fix-includes.patch delete mode 100644 recipes/libnl/files/fix-pc-file.patch delete mode 100644 recipes/libnl/files/local-includes.patch delete mode 100644 recipes/libnl/files/netlink-local-fix.patch delete mode 100644 recipes/libnl/files/respect-ldflags.patch (limited to 'recipes/libnl/files') diff --git a/recipes/libnl/files/dont-link-libnl-from-sysroot.patch b/recipes/libnl/files/dont-link-libnl-from-sysroot.patch deleted file mode 100644 index beb63617ac..0000000000 --- a/recipes/libnl/files/dont-link-libnl-from-sysroot.patch +++ /dev/null @@ -1,26 +0,0 @@ -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=%) - diff --git a/recipes/libnl/files/fix-includes.patch b/recipes/libnl/files/fix-includes.patch deleted file mode 100644 index b172fd2f86..0000000000 --- a/recipes/libnl/files/fix-includes.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 - #include - -+#ifndef VLAN_FLAG_REORDER_HDR - #include -+#endif - - /** @cond SKIP */ - #define VLAN_HAS_ID (1<<0) diff --git a/recipes/libnl/files/fix-pc-file.patch b/recipes/libnl/files/fix-pc-file.patch deleted file mode 100644 index 77f3e88562..0000000000 --- a/recipes/libnl/files/fix-pc-file.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: git/libnl-2.0.pc.in -=================================================================== ---- git.orig/libnl-2.0.pc.in -+++ git/libnl-2.0.pc.in -@@ -6,5 +6,5 @@ - Name: libnl - Description: Convenience library for netlink sockets - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lnl -+Libs: -L${libdir} -lnl -lnl-genl -lnl-nf -lnl-route - Cflags: -I${includedir} diff --git a/recipes/libnl/files/local-includes.patch b/recipes/libnl/files/local-includes.patch deleted file mode 100644 index 85659db6d7..0000000000 --- a/recipes/libnl/files/local-includes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN libnl-1.1.orig/Makefile.opts.in libnl-1.1/Makefile.opts.in ---- libnl-1.1.orig/Makefile.opts.in 2008-01-14 15:48:45.000000000 +0000 -+++ libnl-1.1/Makefile.opts.in 2009-04-06 10:20:40.000000000 +0000 -@@ -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/recipes/libnl/files/netlink-local-fix.patch b/recipes/libnl/files/netlink-local-fix.patch deleted file mode 100644 index 51c6736025..0000000000 --- a/recipes/libnl/files/netlink-local-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: libnl-1.1/include/netlink-local.h -=================================================================== ---- libnl-1.1.orig/include/netlink-local.h 2009-06-18 15:28:32.614209645 +0400 -+++ libnl-1.1/include/netlink-local.h 2009-06-18 15:28:44.094190518 +0400 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/recipes/libnl/files/respect-ldflags.patch b/recipes/libnl/files/respect-ldflags.patch deleted file mode 100644 index ba97dc6724..0000000000 --- a/recipes/libnl/files/respect-ldflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN libnl-1.1.orig/lib/Makefile libnl-1.1/lib/Makefile ---- libnl-1.1.orig/lib/Makefile 2008-01-14 15:48:45.000000000 +0000 -+++ libnl-1.1/lib/Makefile 2009-04-06 10:16:21.000000000 +0000 -@@ -48,7 +48,7 @@ - - $(OUT_SLIB): ../Makefile.opts $(OBJ) - @echo " LD $(OUT_SLIB)"; \ -- $(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc -+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc - @echo " LN $(OUT_SLIB) $(LN1_SLIB)"; \ - rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB) - @echo " LN $(LN1_SLIB) $(LN_SLIB)"; \ -- cgit 1.2.3-korg