summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlumag <dbaryshkov@gmail.com>2011-09-04 02:26:18 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2011-09-04 09:18:53 +0200
commit23de2d1dd45bcdde815a0e94c1e4ada1965ccf7d (patch)
tree48bb6668445a4e6cf25e06ee099c216f0ed3fafd
parentc434bc4f65fc06ad2fe02096f54b20a23a1ef303 (diff)
downloadmeta-openembedded-23de2d1dd45bcdde815a0e94c1e4ada1965ccf7d.tar.gz
tcp-wrappers: fix parallel builds
Inparallel builds make can try to rebuild a object file while cflags file is not yet built. Fix that by providing an explicit cflags dependency on config-check. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--meta-oe/recipes-support/tcp-wrappers/tcp-wrappers-7.6/fix-cflags-dep.patch18
-rw-r--r--meta-oe/recipes-support/tcp-wrappers/tcp-wrappers_7.6.bb1
2 files changed, 19 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/tcp-wrappers/tcp-wrappers-7.6/fix-cflags-dep.patch b/meta-oe/recipes-support/tcp-wrappers/tcp-wrappers-7.6/fix-cflags-dep.patch
new file mode 100644
index 000000000..ef15e9f51
--- /dev/null
+++ b/meta-oe/recipes-support/tcp-wrappers/tcp-wrappers-7.6/fix-cflags-dep.patch
@@ -0,0 +1,18 @@
1Upstream-Status: Pending
2
3Fix builds failing as there is no direct rule to rebuild cflags
4
5Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
6
7Index: tcp_wrappers_7.6/Makefile
8===================================================================
9--- tcp_wrappers_7.6.orig/Makefile 2011-09-02 03:34:07.000000000 +0400
10+++ tcp_wrappers_7.6/Makefile 2011-09-02 03:34:19.000000000 +0400
11@@ -732,6 +732,7 @@
12
13 # Invalidate all object files when the compiler options (CFLAGS) have changed.
14
15+cflags: config-check
16 config-check:
17 @set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; }
18 @set +e; echo $(CFLAGS) >cflags.new ; \
diff --git a/meta-oe/recipes-support/tcp-wrappers/tcp-wrappers_7.6.bb b/meta-oe/recipes-support/tcp-wrappers/tcp-wrappers_7.6.bb
index c92447ea0..96448a947 100644
--- a/meta-oe/recipes-support/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/meta-oe/recipes-support/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -29,6 +29,7 @@ SRC_URI = "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \
29 file://size_t.patch \ 29 file://size_t.patch \
30 file://tcpdchk_libwrapped.patch \ 30 file://tcpdchk_libwrapped.patch \
31 file://ldflags.patch \ 31 file://ldflags.patch \
32 file://fix-cflags-dep.patch \
32 \ 33 \
33 file://try-from.8 \ 34 file://try-from.8 \
34 file://safe_finger.8" 35 file://safe_finger.8"