sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

neard: do not ship version.h 

The HEADERS' name has been changed to pkginclude_HEADERS, so use
nodist_pkginclude_HEADERS, otherwise version.h would be shipped.

It would cause other pkgs failed to build if ship version.h to
usr/include/version.h

(From OE-Core rev: 2025284acf8999d254c671b5e259587a4171858f)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang 2015-02-12 00:42:46 -08:00 committed by Richard Purdie
parent 146f28ad19
commit f404ab2563
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch Normal file
View File

@ -0,0 +1,36 @@
From bfd32d68cfc9f1e31dab88e07446d1c02bc80b5e Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Thu, 12 Feb 2015 00:39:29 -0800
Subject: [PATCH] Makefile.am: do not ship version.h
The HEADERS' name has been changed to pkginclude_HEADERS, so use
nodist_pkginclude_HEADERS, otherwise version.h would be shipped.
Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 3334790..69cd58f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,11 +10,11 @@ pkginclude_HEADERS = include/types.h include/log.h include/plugin.h \
include/tlv.h include/setting.h include/device.h \
include/nfc_copy.h include/snep.h
-nodist_include_HEADERS = include/version.h
+nodist_pkginclude_HEADERS = include/version.h
noinst_HEADERS = include/dbus.h
-local_headers = $(foreach file,$(pkginclude_HEADERS) $(nodist_include_HEADERS) \
+local_headers = $(foreach file,$(pkginclude_HEADERS) $(nodist_pkginclude_HEADERS) \
$(noinst_HEADERS), include/near/$(notdir $(file)))
gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \
--
1.7.9.5

1
meta/recipes-connectivity/neard/neard_0.15.bb
View File

@ -3,6 +3,7 @@ require neard.inc
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 \
"
SRC_URI[md5sum] = "b746ce62eeef88e8de90765e00a75a1c"
SRC_URI[sha256sum] = "651f6513d32cdaf8a426255d03aff38a6620a89b0567ec2b36606c6330a93353"