diff options
| author | Jackie Huang <jackie.huang@windriver.com> | 2014-04-09 15:50:26 +0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-04-20 13:42:06 +0200 |
| commit | 37008a7a8c25688eb9e6bba7f1bb1d91906feb6d (patch) | |
| tree | 2e1337f5a7eb6e38c265586d238f2aa0685ddf80 | |
| parent | 9fe857dd8d2814edfa3a5821ec5b409404f77591 (diff) | |
| download | meta-openembedded-37008a7a8c25688eb9e6bba7f1bb1d91906feb6d.tar.gz | |
fbset: fix parallel build
Fix an incorrect dependency in makefile so that we can build
in parallel.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/fbset/fbset-2.1/fbset-2.1-fix-makefile-dep.patch | 31 | ||||
| -rw-r--r-- | meta-oe/recipes-support/fbset/fbset_2.1.bb | 6 |
2 files changed, 34 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/fbset/fbset-2.1/fbset-2.1-fix-makefile-dep.patch b/meta-oe/recipes-support/fbset/fbset-2.1/fbset-2.1-fix-makefile-dep.patch new file mode 100644 index 0000000000..41ab8af3de --- /dev/null +++ b/meta-oe/recipes-support/fbset/fbset-2.1/fbset-2.1-fix-makefile-dep.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | From 3db6782de1de7ca4f1bb9ee7652c4f2808e57539 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
| 3 | Date: Thu, 10 Jan 2013 12:24:33 +0800 | ||
| 4 | Subject: [PATCH] fbset 2.1 fix makefile dep modes.tab.c | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [no upstream] | ||
| 7 | |||
| 8 | fix the error in parallel build: | ||
| 9 | make: *** No rule to make target `modes.tab.h', needed by `lex.yy.o'. Stop. | ||
| 10 | |||
| 11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
| 12 | --- | ||
| 13 | Makefile | 2 +- | ||
| 14 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/Makefile b/Makefile | ||
| 17 | index 61536c1..09183e5 100644 | ||
| 18 | --- a/Makefile | ||
| 19 | +++ b/Makefile | ||
| 20 | @@ -15,7 +15,7 @@ fbset: fbset.o modes.tab.o lex.yy.o | ||
| 21 | |||
| 22 | fbset.o: fbset.c fbset.h fb.h | ||
| 23 | modes.tab.o: modes.tab.c fbset.h fb.h | ||
| 24 | -lex.yy.o: lex.yy.c fbset.h modes.tab.h | ||
| 25 | +lex.yy.o: lex.yy.c fbset.h modes.tab.c | ||
| 26 | |||
| 27 | lex.yy.c: modes.l | ||
| 28 | $(FLEX) modes.l | ||
| 29 | -- | ||
| 30 | 1.7.4.1 | ||
| 31 | |||
diff --git a/meta-oe/recipes-support/fbset/fbset_2.1.bb b/meta-oe/recipes-support/fbset/fbset_2.1.bb index aa780081e0..84f35ffa2a 100644 --- a/meta-oe/recipes-support/fbset/fbset_2.1.bb +++ b/meta-oe/recipes-support/fbset/fbset_2.1.bb | |||
| @@ -14,12 +14,12 @@ DEPENDS = "bison-native" | |||
| 14 | PR = "r4" | 14 | PR = "r4" |
| 15 | 15 | ||
| 16 | SRC_URI = "http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz \ | 16 | SRC_URI = "http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz \ |
| 17 | file://makefile.patch" | 17 | file://makefile.patch \ |
| 18 | file://fbset-2.1-fix-makefile-dep.patch \ | ||
| 19 | " | ||
| 18 | 20 | ||
| 19 | inherit autotools update-alternatives | 21 | inherit autotools update-alternatives |
| 20 | 22 | ||
| 21 | PARALLEL_MAKE = "" | ||
| 22 | |||
| 23 | do_install() { | 23 | do_install() { |
| 24 | install -d ${D}${sbindir} ${D}${datadir}/man/man8 ${D}${datadir}/man/man5 | 24 | install -d ${D}${sbindir} ${D}${datadir}/man/man8 ${D}${datadir}/man/man5 |
| 25 | install -m 0755 ${WORKDIR}/${P}/fbset ${D}${sbindir}/fbset.real | 25 | install -m 0755 ${WORKDIR}/${P}/fbset ${D}${sbindir}/fbset.real |
