summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-03-17 15:14:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-21 22:39:17 +0000
commita1eb378771bcb427a60c56b8bfdbc93948917213 (patch)
tree8ce83772083d9d245eb05cbc8a29fe685b721ad5 /meta
parent7e0985bab68547f946163828a16beab7542fca2e (diff)
downloadpoky-a1eb378771bcb427a60c56b8bfdbc93948917213.tar.gz
neard: Fix parallel build issue
This only started showing up now for some reason but it does seem like a legitimate bug in Makefile.am. (From OE-Core rev: f43290f6e302dbacf5581d1fe1c6c991dd387779) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch35
-rw-r--r--meta/recipes-connectivity/neard/neard_0.16.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch b/meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch
new file mode 100644
index 0000000000..d8e8a5e5da
--- /dev/null
+++ b/meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch
@@ -0,0 +1,35 @@
1From affaa2021a54c30353e4e1fee09c13a4de2196be Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Fri, 17 Mar 2017 14:24:29 +0200
4Subject: [PATCH] Add header dependency to nciattach.o
5
6This can happen when compiling nciattach.o:
7
8| In file included from ../neard-0.16/tools/nciattach.c:47:0:
9| ../neard-0.16/src/near.h:30:27: fatal error: near/nfc_copy.h: No such
10file or directory
11| #include <near/nfc_copy.h>
12
13Add the missing dependency to local headers.
14
15Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
16Upstream-Status: Submitted [mailinglist]
17---
18 Makefile.am | 1 +
19 1 file changed, 1 insertion(+)
20
21diff --git a/Makefile.am b/Makefile.am
22index fa552ee..acef6ba 100644
23--- a/Makefile.am
24+++ b/Makefile.am
25@@ -253,6 +253,7 @@ se/builtin.h: src/genbuiltin $(builtin_se_sources)
26
27 $(src_neard_OBJECTS) \
28 $(tools_nfctool_nfctool_OBJECTS) \
29+$(tools_nciattach_OBJECTS) \
30 $(plugin_objects) \
31 $(se_seeld_OBJECTS) \
32 $(unit_test_ndef_parse_OBJECTS) \
33--
342.11.0
35
diff --git a/meta/recipes-connectivity/neard/neard_0.16.bb b/meta/recipes-connectivity/neard/neard_0.16.bb
index d6157a8965..cc6af4e1ca 100644
--- a/meta/recipes-connectivity/neard/neard_0.16.bb
+++ b/meta/recipes-connectivity/neard/neard_0.16.bb
@@ -9,6 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \
9 file://neard.in \ 9 file://neard.in \
10 file://Makefile.am-fix-parallel-issue.patch \ 10 file://Makefile.am-fix-parallel-issue.patch \
11 file://Makefile.am-do-not-ship-version.h.patch \ 11 file://Makefile.am-do-not-ship-version.h.patch \
12 file://0001-Add-header-dependency-to-nciattach.o.patch \
12 " 13 "
13SRC_URI[md5sum] = "5c691fb7872856dc0d909c298bc8cb41" 14SRC_URI[md5sum] = "5c691fb7872856dc0d909c298bc8cb41"
14SRC_URI[sha256sum] = "eae3b11c541a988ec11ca94b7deab01080cd5b58cfef3ced6ceac9b6e6e65b36" 15SRC_URI[sha256sum] = "eae3b11c541a988ec11ca94b7deab01080cd5b58cfef3ced6ceac9b6e6e65b36"