summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-06-13 18:03:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-14 08:43:56 +0100
commit5cc9702026f6c5db91d82f74f96824f3709c9209 (patch)
treec7b26a75151a33837a9a7dfb57fbc19fae7dacbf /meta
parenta08ef9a3a3c3541a4dac6de6c395ba9e193fa41b (diff)
downloadpoky-5cc9702026f6c5db91d82f74f96824f3709c9209.tar.gz
neard: fix more parallel build issues
One fix, another appears... root-cause to a magic dependency hiding at the bottom of the Makefile, and add all binaries to it. [ YOCTO #6416 ] (From OE-Core rev: 4625eb0793ff59e4414017df0371ee9b89f47b38) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/neard/neard/Fix-snep-send-parallel-build.patch31
-rw-r--r--meta/recipes-connectivity/neard/neard/parallel-build.patch40
-rw-r--r--meta/recipes-connectivity/neard/neard_0.14.bb2
3 files changed, 41 insertions, 32 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
deleted file mode 100644
index f3029927d0..0000000000
--- a/meta/recipes-connectivity/neard/neard/Fix-snep-send-parallel-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From fbbf600df474865172b47212d94e3dc5013cc2df Mon Sep 17 00:00:00 2001
2From: Cristian Iorga <cristian.iorga@intel.com>
3Date: Wed, 4 Jun 2014 16:40:18 +0300
4Subject: [PATCH] tools: Fix snep-send parallel build
5
6tools/snep-send object might cause a
7parallel build failure,due to undetected
8dependency on dbus.h header file.
9
10Upstream-Status: Pending
11Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
12---
13 Makefile.am | 2 ++
14 1 file changed, 2 insertions(+)
15
16diff --git a/Makefile.am b/Makefile.am
17index 26f49e7..0e4a5b5 100644
18--- a/Makefile.am
19+++ b/Makefile.am
20@@ -169,6 +169,8 @@ tools_snep_send_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \
21 src/agent.c
22 tools_snep_send_LDADD = ${GLIB_LIBS} ${DBUS_LIBS}
23
24+tools/snep-send.$(OBJEXT): include/near/dbus.h
25+
26 tools_nfctool_nfctool_SOURCES = tools/nfctool/main.c \
27 tools/nfctool/nfctool.h \
28 tools/nfctool/adapter.h \
29--
301.9.1
31
diff --git a/meta/recipes-connectivity/neard/neard/parallel-build.patch b/meta/recipes-connectivity/neard/neard/parallel-build.patch
new file mode 100644
index 0000000000..1837ad010c
--- /dev/null
+++ b/meta/recipes-connectivity/neard/neard/parallel-build.patch
@@ -0,0 +1,40 @@
1Upstream-Status: Pending
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 488e898300f7a4ab9ba73307967ae9e02b7a6511 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Fri, 13 Jun 2014 17:49:45 +0100
7Subject: [PATCH] Makefile: add missing binaries to dependency on
8 local_headers
9
10seeld and snap_send were missing from the rule that generates the header symlink
11farm, resulting in headers not being available in highly parallel builds.
12
13Signed-off-by: Ross Burton <ross.burton@intel.com>
14---
15 Makefile.am | 9 ++++++++-
16 1 file changed, 8 insertions(+), 1 deletion(-)
17
18diff --git a/Makefile.am b/Makefile.am
19index c51351f..8e58ac1 100644
20--- a/Makefile.am
21+++ b/Makefile.am
22@@ -254,7 +254,14 @@ se/plugin.$(OBJEXT): se/builtin.h
23 se/builtin.h: src/genbuiltin $(builtin_se_sources)
24 $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_se_modules) > $@
25
26-$(src_neard_OBJECTS) $(tools_nfctool_nfctool_OBJECTS) $(plugin_objects): $(local_headers)
27+$(src_neard_OBJECTS) \
28+$(tools_nfctool_nfctool_OBJECTS) \
29+$(plugin_objects) \
30+$(se_seeld_OBJECTS) \
31+$(unit_test_ndef_parse_OBJECTS) \
32+$(unit_test_ndef_build_OBJECTS) \
33+$(unit_test_snep-read_OBJECTS) \
34+$(tools_snep_send_OBJECTS): $(local_headers)
35
36 include/near/version.h: include/version.h
37 $(AM_V_at)$(MKDIR_P) include/near
38--
391.7.10.4
40
diff --git a/meta/recipes-connectivity/neard/neard_0.14.bb b/meta/recipes-connectivity/neard/neard_0.14.bb
index 663d7ea768..daf3a4b7d1 100644
--- a/meta/recipes-connectivity/neard/neard_0.14.bb
+++ b/meta/recipes-connectivity/neard/neard_0.14.bb
@@ -1,7 +1,7 @@
1require neard.inc 1require neard.inc
2 2
3SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BPN}-${PV}.tar.xz \ 3SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BPN}-${PV}.tar.xz \
4 file://Fix-snep-send-parallel-build.patch \ 4 file://parallel-build.patch \
5 file://neard.in \ 5 file://neard.in \
6 file://neard.service.in \ 6 file://neard.service.in \
7 " 7 "