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.

(From meta-openembedded rev: 23de2d1dd45bcdde815a0e94c1e4ada1965ccf7d)

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/recipes-support/tcp-wrappers/tcp-wrappers-7.6/fix-cflags-dep.patch b/meta-openembedded/meta-oe/recipes-support/tcp-wrappers/tcp-wrappers-7.6/fix-cflags-dep.patch
new file mode 100644 (file)
index 0000000..ef15e9f
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/tcp-wrappers/tcp-wrappers-7.6/fix-cflags-dep.patch
@@ -0,0 +1,18 @@
+Upstream-Status: Pending
+
+Fix builds failing as there is no direct rule to rebuild cflags
+
+Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+
+Index: tcp_wrappers_7.6/Makefile
+===================================================================
+--- tcp_wrappers_7.6.orig/Makefile     2011-09-02 03:34:07.000000000 +0400
++++ tcp_wrappers_7.6/Makefile  2011-09-02 03:34:19.000000000 +0400
+@@ -732,6 +732,7 @@
+
+ # Invalidate all object files when the compiler options (CFLAGS) have changed.
+
++cflags: config-check
+ config-check:
+       @set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; }
+       @set +e; echo $(CFLAGS) >cflags.new ; \

diff --git a/meta-openembedded/meta-oe/recipes-support/tcp-wrappers/tcp-wrappers_7.6.bb b/meta-openembedded/meta-oe/recipes-support/tcp-wrappers/tcp-wrappers_7.6.bb
index c92447e..96448a9 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-support/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/meta-openembedded/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 \
            file://size_t.patch \
            file://tcpdchk_libwrapped.patch \
            file://ldflags.patch \
+           file://fix-cflags-dep.patch \
            \
            file://try-from.8 \
            file://safe_finger.8"