aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-13 12:52:37 +0000
committerRoss Burton <ross.burton@intel.com>2018-01-29 13:14:48 +0000
commit06ad956ceb7a38715ab3d84e1f47a5557639c546 (patch)
tree491fcba800055a4ff9a2122d3c11d5441d1daadc /meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch
parent4f51719c5bf4371c96107a70d9e8134bb837562c (diff)
downloadmeta-openembedded-contrib-ross/pcmcia.tar.gz
meta-openembedded-contrib-ross/pcmcia.tar.bz2
meta-openembedded-contrib-ross/pcmcia.zip
pcmciautils: add (from oe-core)ross/pcmcia
Modern hardware doesn't really use PCMCIA so the support has been moved out of oe-core. Move into meta-oe for people who still want it. Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch')
-rw-r--r--meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch b/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch
new file mode 100644
index 0000000000..f5a518ff73
--- /dev/null
+++ b/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch
@@ -0,0 +1,43 @@
+"make src/lex_config.o"
+
+results in:
+
+src/lex_config.l:35:25: fatal error: yacc_config.h: No such file or directory
+
+so add missing dependency through a missing rule. Also remove a rule which
+doesn't appear to do anything.
+
+RP
+2016/1/31
+
+Upstream-Status: Pending
+
+Index: pcmciautils-018/Makefile
+===================================================================
+--- pcmciautils-018.orig/Makefile
++++ pcmciautils-018/Makefile
+@@ -249,6 +249,9 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st
+ yacc_config.o lex_config.o: %.o: %.c src/yacc_config.h
+ $(CC) -c -MD -O -pipe $(CPPFLAGS) $<
+
++src/lex_config.o : src/lex_config.c src/yacc_config.h
++ $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
++
+ debugtools: ccdv $(CBDUMP) $(CISDUMP)
+
+ $(CBDUMP): $(LIBC) debug/cbdump.o
+Index: pcmciautils-018/Makefile
+===================================================================
+--- pcmciautils-018.orig/Makefile
++++ pcmciautils-018/Makefile
+@@ -246,8 +246,8 @@ $(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
+- $(CC) -c -MD -O -pipe $(CPPFLAGS) $<
++src/lex_config.o : src/lex_config.c src/yacc_config.h ccdv
++ $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+
+ debugtools: ccdv $(CBDUMP) $(CISDUMP)
+