Merge pull request #1325 from ApexAI/iox-#1323-remove-cpptoml-patch-release-2.0

elBoberido · web-flow · commit 86df051d40ab · 2022-04-08T17:43:09.000+02:00
iox-#1323 Remove cpptoml patch and directly add missing include for release_2.0
diff --git a/doc/website/release-notes/.pages b/doc/website/release-notes/.pages
@@ -1,4 +1,6 @@
 nav:
+  - iceoryx-v2-0-2.md
+  - iceoryx-v2-0-1.md
   - iceoryx-v2-0-0.md
   - iceoryx-v1-0-2.md
   - iceoryx-v1-0-1.md
diff --git a/doc/website/release-notes/iceoryx-v2-0-2.md b/doc/website/release-notes/iceoryx-v2-0-2.md
@@ -0,0 +1,9 @@
+# iceoryx v2.0.2
+
+## [v2.0.2](https://github.com/eclipse-iceoryx/iceoryx/tree/v2.0.2) (2022-04-08)
+
+[Full Changelog](https://github.com/eclipse-iceoryx/iceoryx/compare/v2.0.1...v2.0.2)
+
+**Bugfixes:**
+
+- Double build issue in ROS2 build farm [\#1323](https://github.com/eclipse-iceoryx/iceoryx/issues/1323)
diff --git a/iceoryx_dds/cmake/cpptoml/0001-Add-include-limits-to-port-to-GCC-11.patch b/iceoryx_dds/cmake/cpptoml/0001-Add-include-limits-to-port-to-GCC-11.patch
diff --git a/iceoryx_dds/cmake/cpptoml/CMakeLists.txt b/iceoryx_dds/cmake/cpptoml/CMakeLists.txt
@@ -63,15 +63,6 @@ endif()
 
 file(MAKE_DIRECTORY ${BUILD_DIR})
 
-execute_process(
-    COMMAND git apply -p1 --ignore-space-change --whitespace=nowarn
-    INPUT_FILE "${CMAKE_CURRENT_LIST_DIR}/0001-Add-include-limits-to-port-to-GCC-11.patch"
-    WORKING_DIRECTORY "${SOURCE_DIR}"
-    RESULT_VARIABLE result)
-if(result)
-    message(WARNING "CMake step [patch] for cpptoml failed: ${result}! Build of cpptoml might fail")
-endif()
-
 execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "-DENABLE_LIBCXX=off" "-DCPPTOML_BUILD_EXAMPLES=off" "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}" "${TOOLCHAIN_FILE}" "${SOURCE_DIR}"
         "-DCMAKE_C_FLAGS_INIT=${CMAKE_C_FLAGS_INIT}"
         "-DCMAKE_CXX_FLAGS_INIT=${CMAKE_CXX_FLAGS_INIT}"
diff --git a/iceoryx_posh/cmake/cpptoml/0001-Add-include-limits-to-port-to-GCC-11.patch b/iceoryx_posh/cmake/cpptoml/0001-Add-include-limits-to-port-to-GCC-11.patch
diff --git a/iceoryx_posh/cmake/cpptoml/CMakeLists.txt b/iceoryx_posh/cmake/cpptoml/CMakeLists.txt
@@ -57,15 +57,6 @@ endif()
 
 file(MAKE_DIRECTORY ${BUILD_DIR})
 
-execute_process(
-    COMMAND git apply -p1 --ignore-space-change --whitespace=nowarn
-    INPUT_FILE "${CMAKE_CURRENT_LIST_DIR}/0001-Add-include-limits-to-port-to-GCC-11.patch"
-    WORKING_DIRECTORY "${SOURCE_DIR}"
-    RESULT_VARIABLE result)
-if(result)
-    message(WARNING "CMake step [patch] for cpptoml failed: ${result}! Build of cpptoml might fail")
-endif()
-
 set(CMAKE_ADDITIONAL_OPTIONS
     "-DCMAKE_C_FLAGS_INIT=${CMAKE_C_FLAGS_INIT}"
     "-DCMAKE_CXX_FLAGS_INIT=${CMAKE_CXX_FLAGS_INIT}"
diff --git a/iceoryx_posh/include/iceoryx_posh/gateway/toml_gateway_config_parser.hpp b/iceoryx_posh/include/iceoryx_posh/gateway/toml_gateway_config_parser.hpp
@@ -23,6 +23,7 @@
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 
 #include <cpptoml.h>
+#include <limits> // workaround for missing include in cpptoml.h
 
 namespace iox
 {
diff --git a/iceoryx_posh/source/roudi/roudi_config_toml_file_provider.cpp b/iceoryx_posh/source/roudi/roudi_config_toml_file_provider.cpp
@@ -24,6 +24,7 @@
 #include "iceoryx_posh/roudi/roudi_cmd_line_parser.hpp"
 
 #include <cpptoml.h>
+#include <limits> // workaround for missing include in cpptoml.h
 #include <string>
 
 namespace iox

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`#include "iceoryx_posh/iceoryx_posh_types.hpp"`
`24`	`24`
`25`	`25`	`#include <cpptoml.h>`
	`26`	`+#include <limits> // workaround for missing include in cpptoml.h`
`26`	`27`
`27`	`28`	`namespace iox`
`28`	`29`	`{`