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>
This commit is contained in:
Jussi Kukkonen 2017-03-17 15:14:33 +02:00 committed by Richard Purdie
parent 7e0985bab6
commit a1eb378771
2 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,35 @@
From affaa2021a54c30353e4e1fee09c13a4de2196be Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Fri, 17 Mar 2017 14:24:29 +0200
Subject: [PATCH] Add header dependency to nciattach.o
This can happen when compiling nciattach.o:
| In file included from ../neard-0.16/tools/nciattach.c:47:0:
| ../neard-0.16/src/near.h:30:27: fatal error: near/nfc_copy.h: No such
file or directory
| #include <near/nfc_copy.h>
Add the missing dependency to local headers.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Upstream-Status: Submitted [mailinglist]
---
Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile.am b/Makefile.am
index fa552ee..acef6ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -253,6 +253,7 @@ se/builtin.h: src/genbuiltin $(builtin_se_sources)
$(src_neard_OBJECTS) \
$(tools_nfctool_nfctool_OBJECTS) \
+$(tools_nciattach_OBJECTS) \
$(plugin_objects) \
$(se_seeld_OBJECTS) \
$(unit_test_ndef_parse_OBJECTS) \
--
2.11.0

View File

@ -9,6 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \
file://neard.in \
file://Makefile.am-fix-parallel-issue.patch \
file://Makefile.am-do-not-ship-version.h.patch \
file://0001-Add-header-dependency-to-nciattach.o.patch \
"
SRC_URI[md5sum] = "5c691fb7872856dc0d909c298bc8cb41"
SRC_URI[sha256sum] = "eae3b11c541a988ec11ca94b7deab01080cd5b58cfef3ced6ceac9b6e6e65b36"