[vlc-devel] [PATCH 2/2] tools: no need to patch cmake for msys2 anymore

[Steve Lhomme]

the issue was pathes that end with ":" which pkg-config.exe doesn't like
---
 extras/tools/cmake-msys-FindPkg.patch | 27 ---------------------------
 extras/tools/tools.mak                |  1 -
 2 files changed, 28 deletions(-)
 delete mode 100644 extras/tools/cmake-msys-FindPkg.patch

diff --git a/extras/tools/cmake-msys-FindPkg.patch b/extras/tools/cmake-msys-FindPkg.patch
deleted file mode 100644
index 2448259dcc..0000000000
--- a/extras/tools/cmake-msys-FindPkg.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- ./Modules/FindPkgConfig.cmake.msys	2017-05-31 16:00:09.000000000 +0200
-+++ ./Modules/FindPkgConfig.cmake	2018-10-03 16:43:37.880991800 +0200
-@@ -345,6 +345,24 @@ macro(_pkg_check_modules_internal _is_re
-       unset(_pkgconfig_path)
-     endif()
- 
-+    if (CYGWIN OR MSYS)
-+        find_program(_cygpath_exe cygpath.exe NO_CMAKE_ENVIRONMENT_PATH)
-+        if(_cygpath_exe)
-+            # fix the PKG_CONFIG_PATH transformed into a cmake path with incorrect msys pathes
-+            file(TO_CMAKE_PATH "$ENV{PKG_CONFIG_PATH}" _pkgconfig_path_cmake)
-+            execute_process(
-+                COMMAND ${_cygpath_exe} "-up" "${_pkgconfig_path_cmake}"
-+                RESULT_VARIABLE _cygpath_retval
-+                OUTPUT_VARIABLE _cygpath_outval
-+                ERROR_VARIABLE _cygpath_error
-+                OUTPUT_STRIP_TRAILING_WHITESPACE
-+                ERROR_STRIP_TRAILING_WHITESPACE)
-+            if (_cygpath_outval)
-+                set(ENV{PKG_CONFIG_PATH} ${_cygpath_outval})
-+            endif()
-+        endif()
-+    endif()
-+
-     # iterate through module list and check whether they exist and match the required version
-     foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list})
-       set(_pkg_check_modules_exist_query)
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index 6df88adb3c..03baa26e90 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -91,7 +91,6 @@ cmake-$(CMAKE_VERSION).tar.gz:
 
 cmake: cmake-$(CMAKE_VERSION).tar.gz
 	$(UNPACK)
-	$(APPLY) cmake-msys-FindPkg.patch
 	$(MOVE)
 
 .buildcmake: cmake
-- 
2.17.1