From 3ef004bb72442fdc8a9a673f7ba0c9f1d3ee84f1 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 20 Apr 2023 14:46:12 -0500 Subject: [PATCH] samples: modules: thrift: filter on CONFIG_FULL_LIBCPP_SUPPORTED Change sample to set CONFIG_FULL_LIBCPP_REQUIRED and to filter on CONFIG_FULL_LIBCPP_SUPPORTED. Since not all toolchains provide a full libc++ this will restrict the sample only to those environments that do. Signed-off-by: Kumar Gala --- samples/modules/thrift/hello/client/prj.conf | 4 +--- samples/modules/thrift/hello/client/sample.yaml | 1 + samples/modules/thrift/hello/server/prj.conf | 4 +--- samples/modules/thrift/hello/server/sample.yaml | 1 + 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/samples/modules/thrift/hello/client/prj.conf b/samples/modules/thrift/hello/client/prj.conf index 83026931ad21..9ca8b3be5388 100644 --- a/samples/modules/thrift/hello/client/prj.conf +++ b/samples/modules/thrift/hello/client/prj.conf @@ -1,12 +1,10 @@ # CONFIG_LIB_CPLUSPLUS Dependencies -CONFIG_NEWLIB_LIBC=y -CONFIG_NEWLIB_LIBC_NANO=n +CONFIG_REQUIRES_FULL_LIBCPP=y # CONFIG_THRIFT Dependencies CONFIG_CPP=y CONFIG_STD_CPP17=y CONFIG_CPP_EXCEPTIONS=y -CONFIG_EXTERNAL_LIBCPP=y CONFIG_POSIX_API=y CONFIG_NETWORKING=y CONFIG_NET_SOCKETS=y diff --git a/samples/modules/thrift/hello/client/sample.yaml b/samples/modules/thrift/hello/client/sample.yaml index abe77def0179..3ea2947ae20f 100644 --- a/samples/modules/thrift/hello/client/sample.yaml +++ b/samples/modules/thrift/hello/client/sample.yaml @@ -7,6 +7,7 @@ common: modules: - thrift platform_allow: mps2_an385 qemu_x86_64 + filter: CONFIG_FULL_LIBCPP_SUPPORTED tests: sample.thrift.hello.server.binaryProtocol: {} sample.thrift.hello.server.compactProtocol: diff --git a/samples/modules/thrift/hello/server/prj.conf b/samples/modules/thrift/hello/server/prj.conf index 20f6631202a0..1aacd9d14d75 100644 --- a/samples/modules/thrift/hello/server/prj.conf +++ b/samples/modules/thrift/hello/server/prj.conf @@ -1,12 +1,10 @@ # Need a full libc++ -CONFIG_NEWLIB_LIBC=y -CONFIG_NEWLIB_LIBC_NANO=n +CONFIG_REQUIRES_FULL_LIBCPP=y # CONFIG_THRIFT Dependencies CONFIG_CPP=y CONFIG_STD_CPP17=y CONFIG_CPP_EXCEPTIONS=y -CONFIG_EXTERNAL_LIBCPP=y CONFIG_POSIX_API=y CONFIG_NET_SOCKETPAIR=y CONFIG_HEAP_MEM_POOL_SIZE=16384 diff --git a/samples/modules/thrift/hello/server/sample.yaml b/samples/modules/thrift/hello/server/sample.yaml index c56bee255607..5a6223f7bdaf 100644 --- a/samples/modules/thrift/hello/server/sample.yaml +++ b/samples/modules/thrift/hello/server/sample.yaml @@ -7,6 +7,7 @@ common: modules: - thrift platform_allow: mps2_an385 qemu_x86_64 + filter: CONFIG_FULL_LIBCPP_SUPPORTED tests: sample.thrift.hello.server.binaryProtocol: {} sample.thrift.hello.server.compactProtocol: