You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2023/12/19 04:38:16 UTC
(nuttx) branch master updated (b67c9e6ca7 -> 1c9fab65d8)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from b67c9e6ca7 syslog/ramlog: improve ramlog performance
new 87553e71f8 cmake build file support with libcxx 17.0.6
new 1c9fab65d8 Revert "testlist: Disable sim:matter ci temporarily"
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
libs/libxx/libcxx.cmake | 46 +++++++++++++++++++++++++++++++++++++-------
tools/ci/testlist/sim-01.dat | 4 +++-
2 files changed, 42 insertions(+), 8 deletions(-)
(nuttx) 01/02: cmake build file support with libcxx 17.0.6
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 87553e71f87142c8b27a7f5f346dcb881c87894f
Author: xuxin19 <xu...@xiaomi.com>
AuthorDate: Thu Dec 14 12:18:01 2023 +0800
cmake build file support with libcxx 17.0.6
Signed-off-by: xuxin19 <xu...@xiaomi.com>
---
libs/libxx/libcxx.cmake | 46 +++++++++++++++++++++++++++++++++++++++-------
1 file changed, 39 insertions(+), 7 deletions(-)
diff --git a/libs/libxx/libcxx.cmake b/libs/libxx/libcxx.cmake
index e66f2840ed..0b4f019102 100644
--- a/libs/libxx/libcxx.cmake
+++ b/libs/libxx/libcxx.cmake
@@ -22,10 +22,6 @@ if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/libcxx)
set(LIBCXX_VERSION ${CONFIG_LIBCXX_VERSION})
- # cmake-format: off
- set(LIBCXX_PATCH_COMMAND
- patch -p1 -d ${CMAKE_CURRENT_LIST_DIR}/libcxx < ${CMAKE_CURRENT_LIST_DIR}/0001_fix_stdatomic_h_miss_typedef.patch)
- # cmake-format: on
FetchContent_Declare(
libcxx
DOWNLOAD_NAME "libcxx-${LIBCXX_VERSION}.src.tar.xz"
@@ -43,7 +39,11 @@ if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/libcxx)
""
TEST_COMMAND
""
- PATCH_COMMAND ${LIBCXX_PATCH_COMMAND}
+ PATCH_COMMAND
+ patch -p1 -d ${CMAKE_CURRENT_LIST_DIR}/libcxx <
+ ${CMAKE_CURRENT_LIST_DIR}/0001_fix_stdatomic_h_miss_typedef.patch && patch
+ -p3 -d ${CMAKE_CURRENT_LIST_DIR}/libcxx <
+ ${CMAKE_CURRENT_LIST_DIR}/mbstate_t.patch
DOWNLOAD_NO_PROGRESS true
TIMEOUT 30)
@@ -91,15 +91,47 @@ file(GLOB SRCSTMP ${CMAKE_CURRENT_LIST_DIR}/libcxx/src/experimental/*.cpp)
list(APPEND SRCS ${SRCSTMP})
file(GLOB SRCSTMP ${CMAKE_CURRENT_LIST_DIR}/libcxx/src/filesystem/*.cpp)
list(APPEND SRCS ${SRCSTMP})
+file(GLOB SRCSTMP ${CMAKE_CURRENT_LIST_DIR}/libcxx/src/ryu/*.cpp)
+list(APPEND SRCS ${SRCSTMP})
+
+if(NOT DEFINED GCCVER)
+ execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version
+ OUTPUT_VARIABLE GCC_VERSION_OUTPUT)
+ string(REGEX MATCH "\\+\\+.* ([0-9]+)\\.[0-9]+" GCC_VERSION_REGEX
+ "${GCC_VERSION_OUTPUT}")
+ set(GCCVER ${CMAKE_MATCH_1})
+endif()
+
+if(GCCVER EQUAL 12)
+ set_source_files_properties(libcxx/src/filesystem/operations.cpp
+ PROPERTIES COMPILE_FLAGS -Wno-maybe-uninitialized)
+ set_source_files_properties(libcxx/src/locale.cpp
+ PROPERTIES COMPILE_FLAGS -Wno-maybe-uninitialized)
+ set_source_files_properties(
+ libcxx/src/string.cpp PROPERTIES COMPILE_FLAGS -Wno-alloc-size-larger-than)
+ set_source_files_properties(libcxx/src/charconv.cpp
+ PROPERTIES COMPILE_FLAGS -Wno-attributes)
+ set_source_files_properties(libcxx/src/locale.cpp PROPERTIES COMPILE_FLAGS
+ -Wno-attributes)
+endif()
+
+if(GCCVER GREATER_EQUAL 12)
+ set_source_files_properties(
+ libcxx/src/string.cpp PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations)
+ set_source_files_properties(libcxx/src/filesystem/path.cpp
+ PROPERTIES COMPILE_FLAGS -Wno-shadow)
+ set_source_files_properties(libcxx/src/ryu/d2s.cpp
+ PROPERTIES COMPILE_FLAGS -Wno-maybe-uninitialized)
+endif()
set_source_files_properties(libcxx/src/barrier.cpp PROPERTIES COMPILE_FLAGS
-Wno-shadow)
set_source_files_properties(libcxx/src/locale.cpp PROPERTIES COMPILE_FLAGS
-Wno-shadow)
-set_source_files_properties(libcxx/src/filesystem/directory_iterator.cpp
- PROPERTIES COMPILE_FLAGS -Wno-shadow)
set_source_files_properties(libcxx/src/filesystem/operations.cpp
PROPERTIES COMPILE_FLAGS -Wno-shadow)
+set_source_files_properties(libcxx/src/condition_variable.cpp
+ PROPERTIES COMPILE_FLAGS -Wno-sign-compare)
nuttx_add_system_library(libcxx)
target_sources(libcxx PRIVATE ${SRCS})
(nuttx) 02/02: Revert "testlist: Disable sim:matter ci temporarily"
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 1c9fab65d8d114d213973d6c1f26ea4ffc429e54
Author: xuxin19 <xu...@xiaomi.com>
AuthorDate: Mon Dec 18 12:15:41 2023 +0800
Revert "testlist: Disable sim:matter ci temporarily"
restart sim:matter ci
This reverts commit 17458c7dbadbc7a61db6be3bdf413fe51b03092d.
---
tools/ci/testlist/sim-01.dat | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/ci/testlist/sim-01.dat b/tools/ci/testlist/sim-01.dat
index 42a6d03877..36ee20c3e6 100644
--- a/tools/ci/testlist/sim-01.dat
+++ b/tools/ci/testlist/sim-01.dat
@@ -33,7 +33,8 @@
# Skip WebAssembly Micro Runtime
-Darwin,sim:wamr
--sim:matter
+# macOS matter compilation is not currently supported
+-Darwin,sim:matter
# Boards build by CMake
CMake,sim:alsa
@@ -53,3 +54,4 @@ CMake,sim:nettest
CMake,sim:note
CMake,sim:nsh
CMake,sim:nxffs
+CMake,sim:matter