2 fixes for parallel build
cover 2 fixes for parallel build
The following changes since commit 4dd4b96b6d60246338bb30ede9f3ab1b2e757be9:
libxfont: Security Advisory - libxfont - CVE-2015-1804 (2015-04-28 07:56:01 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/parallel
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/parallel
Robert Yang (2):
bison: fix parallel issue
pcmciautils: fix for parallel build
.../Makefile-fix-for-parallel-build.patch | 12 +++---- .../0001-src-local.mk-fix-parallel-issue.patch | 33 ++++++++++++++++++++ meta/recipes-devtools/bison/bison_3.0.4.bb | 1 + 3 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch
Signature · 1 line
1.7.9.5
PATCH 1/2 bison: fix parallel issue
Fixed:
rm -f src/yacc src/yacc.tmp
echo '#! /bin/sh' >src/yacc.tmp/bin/bash: src/yacc.tmp: No such file or directory Makefile:6670: recipe for target 'src/yacc' failed
--- .../0001-src-local.mk-fix-parallel-issue.patch | 33 ++++++++++++++++++++ meta/recipes-devtools/bison/bison_3.0.4.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch
meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 3a15f7c9ace6c0294edc313a1848cafcc31b2a92 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +Date: Fri, 24 Apr 2015 00:38:32 -0700 +Subject: [PATCH] src/local.mk: fix parallel issue + +Fixed: +rm -f src/yacc src/yacc.tmp +echo '#! /bin/sh' >src/yacc.tmp +/bin/bash: src/yacc.tmp: No such file or directory +Makefile:6670: recipe for target 'src/yacc' failed + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <[email protected]> +--- + src/local.mk | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/local.mk b/src/local.mk +index 573ad00..28bfae4 100644 +--- a/src/local.mk ++++ b/src/local.mk +@@ -119,6 +119,7 @@ MOSTLYCLEANFILES += src/yacc + + src/yacc: + $(AM_V_GEN)rm -f $@ [email protected] ++ $(AM_V_at)$(MKDIR_P) src + $(AM_V_at)echo '#! /bin/sh' >[email protected] + $(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>[email protected] + $(AM_V_at)chmod a+x [email protected] +-- +1.7.9.5 +
meta/recipes-devtools/bison/bison_3.0.4.bb +1 -0
@@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ file://m4.patch \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://dont-depend-on-help2man.patch.patch \ + file://0001-src-local.mk-fix-parallel-issue.patch \ " # No point in hardcoding path to m4, just use PATH
Signature · 1 line
1.7.9.5
PATCH 2/2 pcmciautils: fix for parallel build
In reply to Robert YangFixed:
Compiling lex_config.c.
src/lex_config.l:34:25: fatal error: yacc_config.h: No such file or directory
There was a patch for fixing the paralle issue before, so modify the patch again.
--- .../Makefile-fix-for-parallel-build.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch +6 -6
@@ -18,11 +18,11 @@ Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> --- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index d45fdc3..d4ffd7e 100644 +index d45fdc3..963453a 100644 --- a/Makefile +++ b/Makefile @@ -246,7 +246,9 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config
@@ -30,9 +30,9 @@ index d45fdc3..d4ffd7e 100644 $(QUIET) $(STRIPCMD) $@ -yacc_config.o lex_config.o: %.o: %.c -+lex_config.o: yacc_config.h -+ -+yacc_config.o lex_config.o: %.o: %.c: %.h ++lex_config.o: lex_config.c yacc_config.h ++ $(CC) -c -MD -O -pipe $(CPPFLAGS) $< ++yacc_config.o: yacc_config.c $(CC) -c -MD -O -pipe $(CPPFLAGS) $< debugtools: ccdv $(CBDUMP) $(CISDUMP)
Signature · 1 line
1.7.9.5