diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-02-21 16:32:33 +0100 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-02-21 16:32:33 +0100 |
| commit | eaeded3d05c033a1011ed86219c678ef3c72240f (patch) | |
| tree | 17fada653f21428f6ed20a519ade132d580aedbd /meta-speech-framework/meta-aac/recipes-avs | |
| parent | 3a788ab8e1f5b076e09a694ba225f7132c6171bf (diff) | |
| parent | 2938eb34a55ebb4cb0427314151b30fd97ef6e78 (diff) | |
Merge remote-tracking branch 'agl/next'
* agl/next:
meta-speech-framework: enable building Alexa voiceagent against zeus
Declare layer compatibility with zeus
Change-Id: I9c717cde0b51635c14f683b8d1d66a563ec3d7ed
Diffstat (limited to 'meta-speech-framework/meta-aac/recipes-avs')
2 files changed, 27 insertions, 0 deletions
diff --git a/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-enable-building-with-g++-9.patch b/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-enable-building-with-g++-9.patch new file mode 100644 index 00000000..0e4f14fd --- /dev/null +++ b/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-enable-building-with-g++-9.patch @@ -0,0 +1,24 @@ +Enable building with g++ 9.x + +Disable -Werror for new warning "deprecated-copy" to avoid build +failure in the packaged copy of googletest with g++ 9.x. This is +hopefully temporary until googletest is upgraded or it becomes +straightforward to build against an externally provided copy. + +Upstream-Status: pending + +Signed-off-by: Scott Murray <scott.murray@konsulko.com> + +diff --git a/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake b/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake +index 777b91e..7832f20 100644 +--- a/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake ++++ b/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake +@@ -91,7 +91,7 @@ macro(config_compiler_and_linker) + set(cxx_no_exception_flags "-D_HAS_EXCEPTIONS=0") + set(cxx_no_rtti_flags "-GR-") + elseif (CMAKE_COMPILER_IS_GNUCXX) +- set(cxx_base_flags "-Wall -Wshadow") ++ set(cxx_base_flags "-Wall -Wshadow -Wno-error=deprecated-copy") + set(cxx_exception_flags "-fexceptions") + set(cxx_no_exception_flags "-fno-exceptions") + # Until version 4.3.2, GCC doesn't define a macro to indicate diff --git a/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.13.bbappend b/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.13.bbappend new file mode 100644 index 00000000..8afb91a9 --- /dev/null +++ b/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.13.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + +SRC_URI += "file://0001-enable-building-with-g++-9.patch" |