apply patch to remove -fcompare-debug-second flag from propagating ou…

…t of umpire
GEOS-DEV · Jan 10, 2024 · d3a66b7 · d3a66b7
1 parent a341ea9
commit d3a66b7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -386,6 +386,7 @@ ExternalProject_Add( chai
                      URL ${CHAI_URL}
                      INSTALL_DIR ${CHAI_DIR}
                      DEPENDS raja
+		     PATCH_COMMAND patch -p0 < ${TPL_MIRROR_DIR}/umpire_fcompare-debug-second.patch
                      BUILD_COMMAND ${TPL_BUILD_COMMAND}
                      INSTALL_COMMAND ${TPL_INSTALL_COMMAND}
                      CMAKE_GENERATOR ${TPL_GENERATOR}

diff --git a/tplMirror/umpire_fcompare-debug-second.patch b/tplMirror/umpire_fcompare-debug-second.patch
@@ -0,0 +1,17 @@
+*** src/tpl/umpire/src/tpl/CMakeLists.txt	2023-07-06 14:40:05.000000000 -0700
+--- src/tpl/umpire/src/tpl/CMakeLists.txt.patch	2024-01-10 12:16:01.869448000 -0800
+***************
+*** 193,204 ****
+    endif ()
+  endif ()
+
+- if (C_COMPILER_FAMILY_IS_GNU)
+-   target_compile_options(umpire_tpl_fmt
+-     INTERFACE 
+-     $<$<COMPILE_LANGUAGE:CXX>:-fcompare-debug-second>)
+- endif ()
+- 
+  install(TARGETS
+    umpire_tpl_fmt
+    EXPORT umpire-targets
+--- 193,198 ----