2 files changed, 34 insertions, 1 deletions

diff --git a/common/recipes-bsp/amt/lms/0001-Protocol.cpp-Add-whitespace-for-gcc6-compile-error.patch b/common/recipes-bsp/amt/lms/0001-Protocol.cpp-Add-whitespace-for-gcc6-compile-error.patch
new file mode 100644
index 00000000..17b206e2
--- /dev/null
+++ b/common/recipes-bsp/amt/lms/0001-Protocol.cpp-Add-whitespace-for-gcc6-compile-error.patch
@@ -0,0 +1,31 @@
+From 8d737ba9745bef223c3d3b96899f11c26102ea04 Mon Sep 17 00:00:00 2001
+From: Saul Wold <sgw@linux.intel.com>
+Date: Mon, 16 May 2016 09:01:05 -0700
+Subject: [PATCH] Protocol.cpp: Add whitespace for gcc6 compile error
+
+When moving from C++-3 -> C++11 additiona white space is required between
+User-defined literals.
+
+Upstream-Status: Pending
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+---
+ src/Protocol.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Protocol.cpp b/src/Protocol.cpp
+index 1c21a0f..3a4a9bb 100755
+--- a/src/Protocol.cpp
++++ b/src/Protocol.cpp
+@@ -1428,7 +1428,7 @@ int Protocol::_handleFQDNChange(const char *fqdn)
+        char host[FQDN_MAX_SIZE + 1];
+ #define LMS_MAX_LINE_LEN 1023
+        char line[LMS_MAX_LINE_LEN + 1];
+-#define LMS_LINE_SIG_FIRST_WORDS(a) "# LMS GENERATED "a" "
++#define LMS_LINE_SIG_FIRST_WORDS(a) "# LMS GENERATED " a " "
+ #define LMS_LINE_SIG_LAST_WORD "LINE"
+ #define LMS_LINE_SIG_LAST_WORD_LEN 4
+ #define LMS_LINE_SIG(a) LMS_LINE_SIG_FIRST_WORDS(a) LMS_LINE_SIG_LAST_WORD
+-- 
+2.5.0
+
diff --git a/common/recipes-bsp/amt/lms8_8.0.0-7.bb b/common/recipes-bsp/amt/lms8_8.0.0-7.bb
index 65c413a8..7989d59e 100644
--- a/common/recipes-bsp/amt/lms8_8.0.0-7.bb
+++ b/common/recipes-bsp/amt/lms8_8.0.0-7.bb
@@ -8,7 +8,9 @@ LICENSE = "BSD_LMS"
 PR = "r0"
 BPN="lms"
 SRC_URI = "http://software.intel.com/sites/default/files/${BPN}-${PV}.tar.gz \
-           file://readlink-declaration.patch"
+           file://readlink-declaration.patch \
+           file://0001-Protocol.cpp-Add-whitespace-for-gcc6-compile-error.patch \
+           "
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'