summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/neard
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-05 18:28:41 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-06 09:22:50 +0100
commitae55abd60ef217ad1a957102d80b06857ea8ebcd (patch)
tree031bc6b594de27fa683a2c68f67a46b0fed07435 /meta/recipes-connectivity/neard
parent085b02d801d2b8bcbb217db2bf758fcf1bbb9f58 (diff)
downloadopenembedded-core-ae55abd60ef217ad1a957102d80b06857ea8ebcd.tar.gz
openembedded-core-ae55abd60ef217ad1a957102d80b06857ea8ebcd.tar.bz2
openembedded-core-ae55abd60ef217ad1a957102d80b06857ea8ebcd.zip
neard: fix for parallel build
for neard tools/snep-send object might cause a parallel build failure,due to undetected dependency on dbus.h header file. Patch will be submitted upstream. Fixes [YOCTO #6389]. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/neard')
-rw-r--r--meta/recipes-connectivity/neard/neard/Fix-snep-send-parallel-build.patch31
-rw-r--r--meta/recipes-connectivity/neard/neard_0.14.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/neard/neard/Fix-snep-send-parallel-build.patch b/meta/recipes-connectivity/neard/neard/Fix-snep-send-parallel-build.patch
new file mode 100644
index 0000000000..f3029927d0
--- /dev/null
+++ b/meta/recipes-connectivity/neard/neard/Fix-snep-send-parallel-build.patch
@@ -0,0 +1,31 @@
+From fbbf600df474865172b47212d94e3dc5013cc2df Mon Sep 17 00:00:00 2001
+From: Cristian Iorga <cristian.iorga@intel.com>
+Date: Wed, 4 Jun 2014 16:40:18 +0300
+Subject: [PATCH] tools: Fix snep-send parallel build
+
+tools/snep-send object might cause a
+parallel build failure,due to undetected
+dependency on dbus.h header file.
+
+Upstream-Status: Pending
+Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
+---
+ Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 26f49e7..0e4a5b5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -169,6 +169,8 @@ tools_snep_send_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \
+ src/agent.c
+ tools_snep_send_LDADD = ${GLIB_LIBS} ${DBUS_LIBS}
+
++tools/snep-send.$(OBJEXT): include/near/dbus.h
++
+ tools_nfctool_nfctool_SOURCES = tools/nfctool/main.c \
+ tools/nfctool/nfctool.h \
+ tools/nfctool/adapter.h \
+--
+1.9.1
+
diff --git a/meta/recipes-connectivity/neard/neard_0.14.bb b/meta/recipes-connectivity/neard/neard_0.14.bb
index ac9aaf1498..663d7ea768 100644
--- a/meta/recipes-connectivity/neard/neard_0.14.bb
+++ b/meta/recipes-connectivity/neard/neard_0.14.bb
@@ -1,6 +1,7 @@
require neard.inc
SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BPN}-${PV}.tar.xz \
+ file://Fix-snep-send-parallel-build.patch \
file://neard.in \
file://neard.service.in \
"