diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-02-14 10:54:52 +0100 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-02-14 10:54:52 +0100 |
commit | b6dc44f585b839ab1a2f0133b74958037fe1cb64 (patch) | |
tree | 5025d5422e79e229c255e886cf1bd177ec11f37d /meta-app-framework/recipes-security/cynara | |
parent | 88a162a657936f14e8e1ac5d6a0c3b368d0e9a45 (diff) | |
parent | 07d0d613cbca9619e3ad5361d39ae0feafbcb168 (diff) |
Merge remote-tracking branch 'agl/sandbox/locust2001/rocko' into HEAD
* agl/sandbox/locust2001/rocko: (33 commits)
most: remove skb_put_data patch from SRC_URI
linux-linaro-qcomlt: update to kernel 4.14
dragonboard-410c: update 96boards-tools recipe
dragonboard-410c: remove ACCEPT_EULA setting
00_local.conf.agl.inc: Disable GObject Introspection Data
linux-ti-staging: Remove linux-dtb.inc
geoclue: Remove unnecessary dependency
u-boot-ota: Fix build error with gcc7
linux-firmware: Remove duplicated lines
Change image type to wic.vmdk
glibc: Arrange patch file
netboot.bbclass: Remove image_types_uboot inheritance
meta-agl-bsp/classes: Remove bbclass files
rygel: Arrange rocko
security-manager: Fix build error that causes gcc v7.0
cynara: Fix build error that causes gcc v7.0
libcap: Fix warning
mesa: Arrange the recipe
libmicrohttpd: Remove the recipe
connman: Arrange patch file
...
Bug-AGL: SPEC-1181
Change-Id: I8fa84553664fd3d7495b42c7198744f05eebcce0
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-app-framework/recipes-security/cynara')
-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 |