From ae55abd60ef217ad1a957102d80b06857ea8ebcd Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 5 Jun 2014 18:28:41 +0300 Subject: 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 Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../neard/neard/Fix-snep-send-parallel-build.patch | 31 ++++++++++++++++++++++ meta/recipes-connectivity/neard/neard_0.14.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-connectivity/neard/neard/Fix-snep-send-parallel-build.patch 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 +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 +--- + 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 \ " -- cgit 1.2.3-korg