Remove obsolete libpoly patch (#6762)
authorAndres Noetzli <andres.noetzli@gmail.com>
Fri, 18 Jun 2021 02:32:43 +0000 (19:32 -0700)
committerGitHub <noreply@github.com>
Fri, 18 Jun 2021 02:32:43 +0000 (02:32 +0000)
The following commit made our libpoly patch for our Windows builds
obsolete:
https://github.com/SRI-CSL/libpoly/commit/ce7e620c54bd907200ce8b11812d123bf5f4ec8e
This resulted in our build getting stuck because it detected that the
patch had already been applied and was prompting the user what to do.
This commit removes that patch file and the corresponding command.

cmake/FindPoly.cmake
cmake/deps-utils/Poly-patch-cmake.patch [deleted file]

index 734962423f1ff2199bf9de3e6cc727856dbb5aaa..e11d85c3fa304e0b2b84e86bde892cac52e74464 100644 (file)
@@ -51,10 +51,6 @@ if(NOT Poly_FOUND_SYSTEM)
   if(CCWIN)
     # Roughly following https://stackoverflow.com/a/44383330/2375725
     set(patchcmd
-        COMMAND
-        patch
-        <SOURCE_DIR>/src/CMakeLists.txt
-        ${CMAKE_CURRENT_LIST_DIR}/deps-utils/Poly-patch-cmake.patch
         # Avoid %z and %llu format specifiers
         COMMAND find <SOURCE_DIR>/ -type f -exec
                 sed -i.orig "s/%z[diu]/%\" PRIu64 \"/g" {} +
diff --git a/cmake/deps-utils/Poly-patch-cmake.patch b/cmake/deps-utils/Poly-patch-cmake.patch
deleted file mode 100644 (file)
index fe8528f..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f91e3e8..6205689 100755
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -38,7 +38,7 @@ set(poly_SOURCES
- )
- if (NOT HAVE_OPEN_MEMSTREAM) 
--  set(poly_SOURCES "utils/open_memstream.c ${poly_SOURCES}")
-+  set(poly_SOURCES utils/open_memstream.c ${poly_SOURCES})
- endif()
- set(polyxx_SOURCES