diff options
author | Changhyeok Bae <changhyeok.bae@gmail.com> | 2017-12-17 15:31:05 +0000 |
---|---|---|
committer | José Bollo <jose.bollo@iot.bzh> | 2018-02-13 11:01:59 +0100 |
commit | 86c97d2b6c78d0fbbb21f9b4aeef75335e1912b5 (patch) | |
tree | 7f09116425df4f7bcbd88501ad25e282f48ed854 | |
parent | c482595a42cb47f322667ec949ad283cf40d715b (diff) |
cynara: Fix build error that causes gcc v7.0
- gcc v7 requires include <functional> for std::function.
- gcc v7 recognize implicit-fallthrough.
Bug-AGL: SPEC-1181
Change-Id: I40b35ef54d3a1e567330102e9e7cbe6882728b95
Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
-rw-r--r-- | meta-app-framework/recipes-security/cynara/cynara/0001-gcc-7-requires-include-functional-for-std-function.patch | 38 | ||||
-rw-r--r-- | meta-app-framework/recipes-security/cynara/cynara_git.bbappend | 5 |
2 files changed, 43 insertions, 0 deletions
diff --git a/meta-app-framework/recipes-security/cynara/cynara/0001-gcc-7-requires-include-functional-for-std-function.patch b/meta-app-framework/recipes-security/cynara/cynara/0001-gcc-7-requires-include-functional-for-std-function.patch new file mode 100644 index 000000000..bd060b26d --- /dev/null +++ b/meta-app-framework/recipes-security/cynara/cynara/0001-gcc-7-requires-include-functional-for-std-function.patch @@ -0,0 +1,38 @@ +From 2169344adbb42ff580856204e2b290e3b04fd447 Mon Sep 17 00:00:00 2001 +From: Changhyeok Bae <changhyeok.bae@gmail.com> +Date: Sun, 17 Dec 2017 15:28:28 +0000 +Subject: [PATCH] gcc-7 requires include <functional> for std::function + +Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> +--- + src/common/types/PolicyBucket.h | 1 + + src/cyad/AdminPolicyParser.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/common/types/PolicyBucket.h b/src/common/types/PolicyBucket.h +index 029d3dd..1bceeca 100644 +--- a/src/common/types/PolicyBucket.h ++++ b/src/common/types/PolicyBucket.h +@@ -30,6 +30,7 @@ + #include <set> + #include <string> + #include <vector> ++#include <functional> + + #include <exceptions/NotImplementedException.h> + #include <types/pointers.h> +diff --git a/src/cyad/AdminPolicyParser.h b/src/cyad/AdminPolicyParser.h +index 53dde23..f38c194 100644 +--- a/src/cyad/AdminPolicyParser.h ++++ b/src/cyad/AdminPolicyParser.h +@@ -25,6 +25,7 @@ + + #include <istream> + #include <memory> ++#include <functional> + + #include <cyad/CynaraAdminPolicies.h> + +-- +2.7.4 + diff --git a/meta-app-framework/recipes-security/cynara/cynara_git.bbappend b/meta-app-framework/recipes-security/cynara/cynara_git.bbappend index 9a61e7044..4c38da1cc 100644 --- a/meta-app-framework/recipes-security/cynara/cynara_git.bbappend +++ b/meta-app-framework/recipes-security/cynara/cynara_git.bbappend @@ -1,3 +1,8 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +SRC_URI_append = " file://0001-gcc-7-requires-include-functional-for-std-function.patch" + +CXXFLAGS_append = " -Wimplicit-fallthrough=0" + pkg_postinst_${PN} () { # Fail on error. set -e |