From 7b3774137b6f36bd68df3612bc2f583c2ddc6273 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 29 May 2024 12:08:20 +0600 Subject: [PATCH 1/2] Fixes for buuilding --- source/CMakeLists.txt | 3 +-- ubl-settings-datetime_ru.po | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index f71c5f7..12a4435 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -71,10 +71,9 @@ add_custom_target( #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -lm") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ -O2 -pipe -fno-plt -fexceptions \ - -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ + -Wformat -Werror=format-security \ -fstack-clash-protection -fcf-protection") - set(SOURCE_FILES ubl-util-standard.h ubl-util-standard.c diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index 552096f..a029a36 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -4,7 +4,7 @@ # UBLinux Team , 2022 # #, fuzzy -msgid "f1\n" +msgid "" msgstr "" "Project-Id-Version: ubl-settings-datetime 1.0\n" "Report-Msgid-Bugs-To: info@ublinux.com\n" -- 2.35.1 From 906ccc46c2dec4a6b2a317a7871e8a95d14ed78e Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 29 May 2024 12:38:20 +0600 Subject: [PATCH 2/2] Returned -D_FORTIFY_SOURCE, building still fixed --- source/CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 12a4435..e8ea30b 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -67,13 +67,17 @@ add_custom_target( DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C} ) -#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a") -#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -lm") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ -O2 -pipe -fno-plt -fexceptions \ - -Wformat -Werror=format-security \ + -Wformat -Werror=format-security \ -fstack-clash-protection -fcf-protection") - + +string(FIND "${CMAKE_CXX_FLAGS}" "-D_FORTIFY_SOURCE" FORTIFY_FOUND) + +if(FORTIFY_FOUND EQUAL -1) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wp,-D_FORTIFY_SOURCE=2") +endif() + set(SOURCE_FILES ubl-util-standard.h ubl-util-standard.c -- 2.35.1