diff options
| author | Andres Noetzli <andres.noetzli@gmail.com> | 2021-06-17 19:32:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-18 02:32:43 +0000 |
| commit | 828702825ab82175029e087eb8911575acd43a82 (patch) | |
| tree | b95b8539dba6bbe0c1680dee2c5bc8e2bc9eca5b | |
| parent | c3950d941da9753d2fb56eafa07be73a1a2ba500 (diff) | |
Remove obsolete libpoly patch (#6762)
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.
| -rw-r--r-- | cmake/FindPoly.cmake | 4 | ||||
| -rw-r--r-- | cmake/deps-utils/Poly-patch-cmake.patch | 13 |
2 files changed, 0 insertions, 17 deletions
diff --git a/cmake/FindPoly.cmake b/cmake/FindPoly.cmake index 734962423..e11d85c3f 100644 --- a/cmake/FindPoly.cmake +++ b/cmake/FindPoly.cmake @@ -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 index fe8528f70..000000000 --- a/cmake/deps-utils/Poly-patch-cmake.patch +++ /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 |