Patchwork [meta-oe] fbset: fix parallel build

login
register
mail settings
Submitter jackie huang
Date April 9, 2014, 7:50 a.m.
Message ID <1397029826-16492-1-git-send-email-jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/70351/
State Accepted, archived
Headers show

Comments

jackie huang - April 9, 2014, 7:50 a.m.
From: Jackie Huang <jackie.huang@windriver.com>

Fix an incorrect dependency in makefile so that we can build
in parallel.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../fbset-2.1/fbset-2.1-fix-makefile-dep.patch     |   31 ++++++++++++++++++++
 meta-oe/recipes-support/fbset/fbset_2.1.bb         |    6 ++--
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-support/fbset/fbset-2.1/fbset-2.1-fix-makefile-dep.patch
Khem Raj - April 9, 2014, 8:10 a.m.
On Apr 8, 2014 9:50 PM, <jackie.huang@windriver.com> wrote:
>
> From: Jackie Huang <jackie.huang@windriver.com>
>
> Fix an incorrect dependency in makefile so that we can build
> in parallel.

this is a good patch thanks. i expect more and more such patches where we
could enable parallel make.
>
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
>  .../fbset-2.1/fbset-2.1-fix-makefile-dep.patch     |   31
++++++++++++++++++++
>  meta-oe/recipes-support/fbset/fbset_2.1.bb         |    6 ++--
>  2 files changed, 34 insertions(+), 3 deletions(-)
>  create mode 100644
meta-oe/recipes-support/fbset/fbset-2.1/fbset-2.1-fix-makefile-dep.patch
>
> 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 0000000..41ab8af
> --- /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.bbb/meta-oe/recipes-support/fbset/
fbset_2.1.bb
> index aa78008..84f35ff 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
> --
> 1.7.9.5
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Martin Jansa - April 20, 2014, 11:47 a.m.
On Wed, Apr 09, 2014 at 03:50:26PM +0800, jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
> 
> Fix an incorrect dependency in makefile so that we can build
> in parallel.

Merged, thanks!

> 
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
>  .../fbset-2.1/fbset-2.1-fix-makefile-dep.patch     |   31 ++++++++++++++++++++
>  meta-oe/recipes-support/fbset/fbset_2.1.bb         |    6 ++--
>  2 files changed, 34 insertions(+), 3 deletions(-)
>  create mode 100644 meta-oe/recipes-support/fbset/fbset-2.1/fbset-2.1-fix-makefile-dep.patch
> 
> 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 0000000..41ab8af
> --- /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 aa78008..84f35ff 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
> -- 
> 1.7.9.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

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 0000000..41ab8af
--- /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 aa78008..84f35ff 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