pcmciautils: Fix makefile race
PATCH 1/1 pcmciautils: Fix makefile race
The existing patch wasn't fixing one issue it claimed to and seemed incorrect in relation to the other.
This patch correctly addresses the parallel make issue, as seen on our autobuilder.
Signed-off-by Richard Purdie <[email protected]>
meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch deleted +0 -41
@@ -1,41 +0,0 @@ -From 5a793a1a9fb3477719aabf7e27ff22ed1acdf559 Mon Sep 17 00:00:00 2001 -From: Roy Li <[email protected]> -Date: Tue, 19 May 2015 15:54:24 +0800 -Subject: [PATCH] fix a parallel building issue - -Fixed: -| src/lex_config.c:34:25: fatal error: yacc_config.h: No such file or directory -| -| #include "yacc_config.h" -| ^ -| compilation terminated. - -And: -Compiling lex_config.c. - src/lex_config.l:34:25: fatal error: yacc_config.h: No such file or directory - -Upstream-Status: Pending - -there are two Makefile rules to generate lex_config.o, one is to generate -lex_config.o other is to generate src/lex_config.o, so we can remove one. -and add the needed dependence for lex_config.o - - -Signed-off-by: Roy Li <[email protected]> ---- - Makefile | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -Index: pcmciautils-018/Makefile -=================================================================== ---- pcmciautils-018.orig/Makefile -+++ pcmciautils-018/Makefile -@@ -246,7 +246,7 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st - $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS) - $(QUIET) $(STRIPCMD) $@ - --yacc_config.o lex_config.o: %.o: %.c -+yacc_config.o lex_config.o: %.o: %.c src/yacc_config.h - $(CC) -c -MD -O -pipe $(CPPFLAGS) $< - - debugtools: ccdv $(CBDUMP) $(CISDUMP)
meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch new file +43 -0
43 lines not on this page · raw message
meta/recipes-bsp/pcmciautils/pcmciautils_018.bb +1 -1
@@ -1,7 +1,7 @@ require pcmciautils.inc SRC_URI += "file://makefile_fix.patch \ - file://0001-fix-a-parallel-building-issue.patch \ + file://makefile_race.patch \ file://lex_sys_types.patch \ "