mirror of
https://github.com/zjs81/meshcore-open.git
synced 2026-07-28 22:38:43 +10:00
Fix CMake configuration for flserial to resolve glibc conflict and remove unused translations from Russian language issue: 280
This commit is contained in:
@@ -74,6 +74,14 @@ set_target_properties(${BINARY_NAME}
|
|||||||
# them to the application.
|
# them to the application.
|
||||||
include(flutter/generated_plugins.cmake)
|
include(flutter/generated_plugins.cmake)
|
||||||
|
|
||||||
|
# Work around tinycthread/glibc 2.43+ conflict: glibc 2.43 (with Clang 21's
|
||||||
|
# C23 default) exports once_flag from stdlib.h bt tinycthread in flserial
|
||||||
|
# defines once_flag as a preprocessor macro, causing a typedef clash.
|
||||||
|
# __STDC_NO_THREADS__ suppresses the C23 once_flag declaration in glibc stdlib.h.
|
||||||
|
if(TARGET flserial)
|
||||||
|
target_compile_definitions(flserial PRIVATE __STDC_NO_THREADS__)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
# === Installation ===
|
# === Installation ===
|
||||||
# By default, "installing" just makes a relocatable bundle in the build
|
# By default, "installing" just makes a relocatable bundle in the build
|
||||||
|
|||||||
@@ -90,8 +90,6 @@
|
|||||||
"ru": [
|
"ru": [
|
||||||
"settings_companionDebugLog",
|
"settings_companionDebugLog",
|
||||||
"settings_companionDebugLogSubtitle",
|
"settings_companionDebugLogSubtitle",
|
||||||
"chat_markAsUnread",
|
|
||||||
"chat_newMessages",
|
|
||||||
"repeater_chanUtil"
|
"repeater_chanUtil"
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user