-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
upstream patch to fix debugsource package creation
introduce option to make -ffile-prefix-map flag conditional from: catchorg/Catch2#2785
- Loading branch information
Showing
2 changed files
with
56 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
From 1512dac7e4c2fddadcc15f7ab316ce3d5b67e7f3 Mon Sep 17 00:00:00 2001 | ||
From: Jan Palus <[email protected]> | ||
Date: Thu, 28 Dec 2023 00:41:54 +0100 | ||
Subject: [PATCH] Make compiler flags for reproducible builds optional | ||
|
||
no change in default behavior: -ffile-prefix-map is still added if | ||
supported by compiler but add option for disabling it as it breaks | ||
generic tools for extracting debuginfo/debugsource from build artifacts | ||
like: https://sourceware.org/git/?p=debugedit.git;a=blob;f=scripts/find-debuginfo.in | ||
--- | ||
CMakeLists.txt | 1 + | ||
src/CMakeLists.txt | 8 ++++++-- | ||
2 files changed, 7 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 2cfb6cd143..20e4036e18 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -11,6 +11,7 @@ endif() | ||
option(CATCH_INSTALL_DOCS "Install documentation alongside library" ON) | ||
option(CATCH_INSTALL_EXTRAS "Install extras (CMake scripts, debugger helpers) alongside library" ON) | ||
option(CATCH_DEVELOPMENT_BUILD "Build tests, enable warnings, enable Werror, etc" OFF) | ||
+option(CATCH_ENABLE_REPRODUCIBLE_BUILD "Add compiler flags for improving build reproducibility" ON) | ||
|
||
include(CMakeDependentOption) | ||
cmake_dependent_option(CATCH_BUILD_TESTING "Build the SelfTest project" ON "CATCH_DEVELOPMENT_BUILD" OFF) | ||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
index d01aab2d5c..eb805ddd0b 100644 | ||
--- a/src/CMakeLists.txt | ||
+++ b/src/CMakeLists.txt | ||
@@ -348,7 +348,9 @@ source_group("generated headers" | ||
) | ||
|
||
add_library(Catch2 ${ALL_FILES}) | ||
-add_build_reproducibility_settings(Catch2) | ||
+if (CATCH_ENABLE_REPRODUCIBLE_BUILD) | ||
+ add_build_reproducibility_settings(Catch2) | ||
+endif() | ||
add_library(Catch2::Catch2 ALIAS Catch2) | ||
|
||
if (ANDROID) | ||
@@ -401,7 +403,9 @@ target_include_directories(Catch2 | ||
add_library(Catch2WithMain | ||
${SOURCES_DIR}/internal/catch_main.cpp | ||
) | ||
-add_build_reproducibility_settings(Catch2WithMain) | ||
+if (CATCH_ENABLE_REPRODUCIBLE_BUILD) | ||
+ add_build_reproducibility_settings(Catch2WithMain) | ||
+endif() | ||
add_library(Catch2::Catch2WithMain ALIAS Catch2WithMain) | ||
target_link_libraries(Catch2WithMain PUBLIC Catch2) | ||
set_target_properties(Catch2WithMain |