diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-28 02:00:57 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-15 21:58:26 +0000 |
commit | 5c87de13cb539c27dd448f70c589877e0a65a87b (patch) | |
tree | fee4bbcb919b88ba662abca740ec3a91ce8dcd32 /meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6 | |
parent | b003df03358aea4e9e094ee339a9f6796866961e (diff) | |
download | poky-5c87de13cb539c27dd448f70c589877e0a65a87b.tar.gz |
tcp-wrappers: fix and enable parallel build
(From OE-Core rev: 3aa806eaae34ea6261816c5300ec4869ffc05c2e)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6')
-rw-r--r-- | meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch new file mode 100644 index 0000000000..797352579b --- /dev/null +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | From daf89d272e51b2153015ce7f54ab0b86182e64c1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Wed, 28 Jan 2015 18:50:23 -0800 | ||
4 | Subject: [PATCH] Makefile: fix for parallel build | ||
5 | |||
6 | Fixed: | ||
7 | make: *** No rule to make target `cflags', needed by `tcpd.o'. Stop. | ||
8 | |||
9 | Let "cflags" depend on config-check which generates cflgas will fix the | ||
10 | problem. | ||
11 | |||
12 | Also fixed: | ||
13 | Fatal error: can't create shared/hosts_access.o: No such file or directory | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | |||
17 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
18 | --- | ||
19 | Makefile | 5 ++++- | ||
20 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/Makefile b/Makefile | ||
23 | index fe5e732..f468751 100644 | ||
24 | --- a/Makefile | ||
25 | +++ b/Makefile | ||
26 | @@ -714,6 +714,7 @@ KIT = README miscd.c tcpd.c fromhost.c hosts_access.c shell_cmd.c \ | ||
27 | LIB = libwrap.a | ||
28 | |||
29 | shared/%.o: %.c | ||
30 | + [ -d shared ] || mkdir -p shared | ||
31 | $(CC) $(CFLAGS) $(SHCFLAGS) -c $< -o $@ | ||
32 | |||
33 | SOMAJOR = 0 | ||
34 | @@ -730,6 +731,8 @@ SHLIB_OBJ= $(addprefix shared/, $(LIB_OBJ)); | ||
35 | |||
36 | all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk $(LIB) | ||
37 | |||
38 | +cflags: config-check | ||
39 | + | ||
40 | # Invalidate all object files when the compiler options (CFLAGS) have changed. | ||
41 | |||
42 | config-check: | ||
43 | @@ -739,7 +742,7 @@ config-check: | ||
44 | then rm cflags.new ; \ | ||
45 | else mv cflags.new cflags ; \ | ||
46 | fi >/dev/null 2>/dev/null | ||
47 | - @if [ ! -d shared ]; then mkdir shared; fi | ||
48 | + @[ -d shared ] || mkdir -p shared | ||
49 | |||
50 | $(LIB): $(LIB_OBJ) | ||
51 | rm -f $(LIB) | ||
52 | -- | ||
53 | 1.7.9.5 | ||
54 | |||