summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch54
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb6
2 files changed, 57 insertions, 3 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 @@
1From daf89d272e51b2153015ce7f54ab0b86182e64c1 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Wed, 28 Jan 2015 18:50:23 -0800
4Subject: [PATCH] Makefile: fix for parallel build
5
6Fixed:
7make: *** No rule to make target `cflags', needed by `tcpd.o'. Stop.
8
9Let "cflags" depend on config-check which generates cflgas will fix the
10problem.
11
12Also fixed:
13Fatal error: can't create shared/hosts_access.o: No such file or directory
14
15Upstream-Status: Pending
16
17Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
18---
19 Makefile | 5 ++++-
20 1 file changed, 4 insertions(+), 1 deletion(-)
21
22diff --git a/Makefile b/Makefile
23index 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--
531.7.9.5
54
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
index 4d6430634e..2630478284 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -40,16 +40,16 @@ SRC_URI = "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \
40 file://tcpdchk_libwrapped.patch \ 40 file://tcpdchk_libwrapped.patch \
41 file://ldflags.patch \ 41 file://ldflags.patch \
42 file://rename_strings_variable.patch \ 42 file://rename_strings_variable.patch \
43 \
44 file://try-from.8 \ 43 file://try-from.8 \
45 file://safe_finger.8" 44 file://safe_finger.8 \
45 file://makefile-fix-parallel.patch \
46 "
46 47
47SRC_URI[md5sum] = "e6fa25f71226d090f34de3f6b122fb5a" 48SRC_URI[md5sum] = "e6fa25f71226d090f34de3f6b122fb5a"
48SRC_URI[sha256sum] = "9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d" 49SRC_URI[sha256sum] = "9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d"
49 50
50S = "${WORKDIR}/tcp_wrappers_${PV}" 51S = "${WORKDIR}/tcp_wrappers_${PV}"
51 52
52PARALLEL_MAKE = ""
53EXTRA_OEMAKE = "'CC=${CC}' \ 53EXTRA_OEMAKE = "'CC=${CC}' \
54 'AR=${AR}' \ 54 'AR=${AR}' \
55 'RANLIB=${RANLIB}' \ 55 'RANLIB=${RANLIB}' \