summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-bsp
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2018-08-14 16:38:16 +0200
committerKhem Raj <raj.khem@gmail.com>2018-08-19 16:09:28 -0700
commit6b92e3e81b30bcf858eda443c20f9f4ff5673c8b (patch)
treea273dabf8c586dfea164ce2d3111bdd4e77e6aec /meta-oe/recipes-bsp
parentdb36d53cc58ec5253166e1cb3e112308a47506e2 (diff)
downloadmeta-openembedded-6b92e3e81b30bcf858eda443c20f9f4ff5673c8b.tar.gz
pcmciautils: drop duplicate chunk from pcmciautils-018/makefile_race.patch
The new rule was patched into the makefile twice. Backport of oe-core commit c52228f4d071 Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-bsp')
-rw-r--r--meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch14
1 files changed, 0 insertions, 14 deletions
diff --git a/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch b/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch
index f5a518ff7..4c5eba795 100644
--- a/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch
+++ b/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch
@@ -16,20 +16,6 @@ Index: pcmciautils-018/Makefile
16=================================================================== 16===================================================================
17--- pcmciautils-018.orig/Makefile 17--- pcmciautils-018.orig/Makefile
18+++ pcmciautils-018/Makefile 18+++ pcmciautils-018/Makefile
19@@ -249,6 +249,9 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st
20 yacc_config.o lex_config.o: %.o: %.c src/yacc_config.h
21 $(CC) -c -MD -O -pipe $(CPPFLAGS) $<
22
23+src/lex_config.o : src/lex_config.c src/yacc_config.h
24+ $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
25+
26 debugtools: ccdv $(CBDUMP) $(CISDUMP)
27
28 $(CBDUMP): $(LIBC) debug/cbdump.o
29Index: pcmciautils-018/Makefile
30===================================================================
31--- pcmciautils-018.orig/Makefile
32+++ pcmciautils-018/Makefile
33@@ -246,8 +246,8 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st 19@@ -246,8 +246,8 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st
34 $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS) 20 $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
35 $(QUIET) $(STRIPCMD) $@ 21 $(QUIET) $(STRIPCMD) $@