diff options
author | Qing He <qing.he@intel.com> | 2010-12-06 15:50:39 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-06 22:02:27 +0000 |
commit | b407939530291f7ddbfc6e220b0dba0d9edb8eaa (patch) | |
tree | 31593e63155ec473fe128f51a033555b1afe2a88 /meta | |
parent | 6940c96874194af19a10c3fa436d08e793f4fa42 (diff) | |
download | poky-b407939530291f7ddbfc6e220b0dba0d9edb8eaa.tar.gz |
libnl: fix typo in the Makefile fix
change .$(OBJEXT) to .lo in the rule to reflect libtool setup
Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch | 10 | ||||
-rw-r--r-- | meta/recipes-support/libnl/libnl_2.0.bb | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch b/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch index d9f00be2b6..214b0dbf76 100644 --- a/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch +++ b/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch | |||
@@ -5,6 +5,14 @@ otherwise the build of lib/route/pktloc.c may fail in a parallel | |||
5 | environment. | 5 | environment. |
6 | 6 | ||
7 | Signed-off-by: Qing He <qing.he@intel.com> | 7 | Signed-off-by: Qing He <qing.he@intel.com> |
8 | |||
9 | 12/06/2010 | ||
10 | |||
11 | the dependency rule should really read pktloc.lo instead of | ||
12 | pktloc.$(OBJEXT), since it's in a libtool setup. | ||
13 | |||
14 | Signed-off-by: Qing He <qing.he@intel.com> | ||
15 | |||
8 | diff --git a/lib/Makefile.am b/lib/Makefile.am | 16 | diff --git a/lib/Makefile.am b/lib/Makefile.am |
9 | index 92a916e..e8b8ef3 100644 | 17 | index 92a916e..e8b8ef3 100644 |
10 | --- a/lib/Makefile.am | 18 | --- a/lib/Makefile.am |
@@ -13,7 +21,7 @@ index 92a916e..e8b8ef3 100644 | |||
13 | route/pktloc_syntax.c: route/pktloc_syntax.y | 21 | route/pktloc_syntax.c: route/pktloc_syntax.y |
14 | $(YACC) -d $(YFLAGS) -o $@ $^ | 22 | $(YACC) -d $(YFLAGS) -o $@ $^ |
15 | 23 | ||
16 | +route/pktloc.$(OBJEXT): route/pktloc_syntax.h route/pktloc_grammar.h | 24 | +route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h |
17 | +route/pktloc_syntax.h: route/pktloc_syntax.c | 25 | +route/pktloc_syntax.h: route/pktloc_syntax.c |
18 | +route/pktloc_grammar.h: route/pktloc_grammar.c | 26 | +route/pktloc_grammar.h: route/pktloc_grammar.c |
19 | + | 27 | + |
diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb index e275670b51..eb89f0d117 100644 --- a/meta/recipes-support/libnl/libnl_2.0.bb +++ b/meta/recipes-support/libnl/libnl_2.0.bb | |||
@@ -7,7 +7,7 @@ LICENSE = "LGPLv2.1" | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc" |
8 | 8 | ||
9 | DEPENDS = "flex-native bison-native" | 9 | DEPENDS = "flex-native bison-native" |
10 | PR = "r1" | 10 | PR = "r2" |
11 | 11 | ||
12 | SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${PN}-${PV}.tar.gz \ | 12 | SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${PN}-${PV}.tar.gz \ |
13 | file://fix-makefile.patch \ | 13 | file://fix-makefile.patch \ |