diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-04-06 10:24:10 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-04-06 10:24:10 +0000 |
| commit | 121da71778dbd602250e0d52fdae15d359d4a50c (patch) | |
| tree | 96886a95b71e7a1c2095954725a1a9666ce444e1 /recipes/libnl | |
| parent | 87ece9c2e0532d110109c94f81b4b5082e76d3a7 (diff) | |
libnl: use LDFLAGS (fixes QA error)
Diffstat (limited to 'recipes/libnl')
| -rw-r--r-- | recipes/libnl/files/local-includes-and-avoid-wrong-ldflags.patch | 13 | ||||
| -rw-r--r-- | recipes/libnl/files/local-includes.patch | 12 | ||||
| -rw-r--r-- | recipes/libnl/files/respect-ldflags.patch | 12 | ||||
| -rw-r--r-- | recipes/libnl/libnl_1.1.bb | 5 |
4 files changed, 27 insertions, 15 deletions
diff --git a/recipes/libnl/files/local-includes-and-avoid-wrong-ldflags.patch b/recipes/libnl/files/local-includes-and-avoid-wrong-ldflags.patch deleted file mode 100644 index 428df53a94..0000000000 --- a/recipes/libnl/files/local-includes-and-avoid-wrong-ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- libnl-1.0-pre8/Makefile.opts.in.orig 2007-11-21 18:25:39.000000000 +0100 -+++ libnl-1.0-pre8/Makefile.opts.in 2008-04-04 23:38:40.000000000 +0200 -@@ -10,8 +10,8 @@ - # - - CC := @CC@ --CFLAGS := @CFLAGS@ --LDFLAGS := @LDFLAGS@ -+CFLAGS := -I./include -I. -I../include @CFLAGS@ -+LDFLAGS := - CPPFLAGS := @CPPFLAGS@ - PACKAGE_NAME := @PACKAGE_NAME@ - PACKAGE_VERSION := @PACKAGE_VERSION@ diff --git a/recipes/libnl/files/local-includes.patch b/recipes/libnl/files/local-includes.patch new file mode 100644 index 0000000000..85659db6d7 --- /dev/null +++ b/recipes/libnl/files/local-includes.patch @@ -0,0 +1,12 @@ +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/respect-ldflags.patch b/recipes/libnl/files/respect-ldflags.patch new file mode 100644 index 0000000000..ba97dc6724 --- /dev/null +++ b/recipes/libnl/files/respect-ldflags.patch @@ -0,0 +1,12 @@ +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)"; \ diff --git a/recipes/libnl/libnl_1.1.bb b/recipes/libnl/libnl_1.1.bb index dcca3c6e92..5f2d6f1a07 100644 --- a/recipes/libnl/libnl_1.1.bb +++ b/recipes/libnl/libnl_1.1.bb @@ -2,7 +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" +PR = "r2" inherit autotools pkgconfig @@ -10,8 +10,9 @@ 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://local-includes.patch;patch=1 \ file://fix-includes.patch;patch=1 \ + file://respect-ldflags.patch;patch=1 \ " do_stage () { |