perf: Patch URI parsing library

eclipse-che4z · Feb 10, 2023 · 741ef11 · 741ef11
1 parent 0bd9a96
commit 741ef11
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 2 deletions.
diff --git a/cmake/apply_patch.cmake → cmake/apply_antlr_patch.cmake b/cmake/apply_patch.cmake → cmake/apply_antlr_patch.cmake
@@ -16,7 +16,7 @@
 # The patch step of ExternalProject_Add is executed repeatedly even when there
 # is no change to CmakeLists or the external project
 
-set(PATCH_STAMP "${CMAKE_BINARY_DIR}/patch_applied.stamp")
+set(PATCH_STAMP "${CMAKE_BINARY_DIR}/antlr_patch_applied.stamp")
 
 if(NOT EXISTS ${PATCH_STAMP})
 	execute_process(COMMAND ${GIT_EXECUTABLE} apply ${PROJECT_SOURCE_DIR}/cmake/antlr_patch.diff)

diff --git a/cmake/apply_uri_patch.cmake b/cmake/apply_uri_patch.cmake
@@ -0,0 +1,18 @@
+# Copyright (c) 2023 Broadcom.
+# The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
+#
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#   Broadcom, Inc. - initial API and implementation
+
+set(PATCH_STAMP "${CMAKE_BINARY_DIR}/uri_patch_applied.stamp")
+
+if(NOT EXISTS ${PATCH_STAMP})
+	execute_process(COMMAND ${GIT_EXECUTABLE} apply ${PROJECT_SOURCE_DIR}/cmake/uri_patch.diff)
+	execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${PATCH_STAMP})
+endif()
diff --git a/cmake/external_antlr4cpp.cmake b/cmake/external_antlr4cpp.cmake
@@ -32,7 +32,7 @@ FetchContent_Declare(
     GIT_SHALLOW    ON
     LOG_DOWNLOAD   ON
     GIT_PROGRESS   1
-    PATCH_COMMAND  ${CMAKE_COMMAND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DCMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -P ${PROJECT_SOURCE_DIR}/cmake/apply_patch.cmake
+    PATCH_COMMAND  ${CMAKE_COMMAND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DCMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -P ${PROJECT_SOURCE_DIR}/cmake/apply_antlr_patch.cmake
 )
 
 FetchContent_GetProperties(antlr4cpp)

diff --git a/cmake/external_uri.cmake b/cmake/external_uri.cmake
@@ -24,6 +24,7 @@ FetchContent_Declare(
   GIT_SHALLOW    ON
   LOG_DOWNLOAD   ON
   GIT_PROGRESS   1
+  PATCH_COMMAND  ${CMAKE_COMMAND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DCMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -P ${PROJECT_SOURCE_DIR}/cmake/apply_uri_patch.cmake
 )
 
 FetchContent_GetProperties(uri_ext)

diff --git a/cmake/uri_patch.diff b/cmake/uri_patch.diff
@@ -0,0 +1,13 @@
+diff --git a/src/detail/uri_parse.cpp b/src/detail/uri_parse.cpp
+index 7f77148..73f581e 100644
+--- a/src/detail/uri_parse.cpp
++++ b/src/detail/uri_parse.cpp
+@@ -31,7 +31,7 @@ bool validate_scheme(string_view::const_iterator &it,
+   }
+
+   // The first character must be a letter
+-  if (!std::isalpha(*it, std::locale("C"))) {
++  if (!std::isalpha(*it, std::locale::classic())) {
+     return false;
+   }
+   ++it;