diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-03-09 20:55:40 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-11 06:27:00 -0700 |
commit | ecba98085f9d7f1bdffc828c6252eb63d0a36d3d (patch) | |
tree | e75d657252a2f5053b9308b98837ea234e3de29d /meta/recipes-bsp/pcmciautils/pcmciautils-018 | |
parent | 0b9428006410f7e1fc358a475de8caf4d5293341 (diff) | |
download | poky-ecba98085f9d7f1bdffc828c6252eb63d0a36d3d.tar.gz |
pcmciautils: drop duplicate chunk from pcmciautils-018/makefile_race.patch
The new rule was patched into the makefile twice.
(From OE-Core rev: c52228f4d0711ab7d75f9f860f637c6351dccd63)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/pcmciautils/pcmciautils-018')
-rw-r--r-- | meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch index f5a518ff73..4c5eba7951 100644 --- a/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch +++ b/meta/recipes-bsp/pcmciautils/pcmciautils-018/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 | ||
29 | Index: 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) $@ |