aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/fbset
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2014-04-09 15:50:26 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2014-04-20 13:42:06 +0200
commit37008a7a8c25688eb9e6bba7f1bb1d91906feb6d (patch)
tree2e1337f5a7eb6e38c265586d238f2aa0685ddf80 /meta-oe/recipes-support/fbset
parent9fe857dd8d2814edfa3a5821ec5b409404f77591 (diff)
downloadmeta-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>
Diffstat (limited to 'meta-oe/recipes-support/fbset')
-rw-r--r--meta-oe/recipes-support/fbset/fbset-2.1/fbset-2.1-fix-makefile-dep.patch31
-rw-r--r--meta-oe/recipes-support/fbset/fbset_2.1.bb6
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 @@
+From 3db6782de1de7ca4f1bb9ee7652c4f2808e57539 Mon Sep 17 00:00:00 2001
+From: Jackie Huang <jackie.huang@windriver.com>
+Date: Thu, 10 Jan 2013 12:24:33 +0800
+Subject: [PATCH] fbset 2.1 fix makefile dep modes.tab.c
+
+Upstream-Status: Inappropriate [no upstream]
+
+fix the error in parallel build:
+make: *** No rule to make target `modes.tab.h', needed by `lex.yy.o'. Stop.
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ Makefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 61536c1..09183e5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,7 +15,7 @@ fbset: fbset.o modes.tab.o lex.yy.o
+
+ fbset.o: fbset.c fbset.h fb.h
+ modes.tab.o: modes.tab.c fbset.h fb.h
+-lex.yy.o: lex.yy.c fbset.h modes.tab.h
++lex.yy.o: lex.yy.c fbset.h modes.tab.c
+
+ lex.yy.c: modes.l
+ $(FLEX) modes.l
+--
+1.7.4.1
+
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"
PR = "r4"
SRC_URI = "http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz \
- file://makefile.patch"
+ file://makefile.patch \
+ file://fbset-2.1-fix-makefile-dep.patch \
+"
inherit autotools update-alternatives
-PARALLEL_MAKE = ""
-
do_install() {
install -d ${D}${sbindir} ${D}${datadir}/man/man8 ${D}${datadir}/man/man5
install -m 0755 ${WORKDIR}/${P}/fbset ${D}${sbindir}/fbset.real