diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-05-26 21:01:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 21:01:32 -0700 |
| commit | af56d50d64d0473f48dc7d4acfabc1b91265cf3b (patch) | |
| tree | 3eabfeb3e0e1669689d2ce4f8f788fe1d64715c3 | |
| parent | cb538ed22fabe3ef7b9847d6d2b6d85f0d185ec3 (diff) | |
| download | vcpkg-af56d50d64d0473f48dc7d4acfabc1b91265cf3b.tar.gz vcpkg-af56d50d64d0473f48dc7d4acfabc1b91265cf3b.zip | |
[libarchive] Disable C4061 which causes build to fail in Visual Studio 2019 16.6 (#11570)
* [libarchive] Disable C4061 which causes build to fail in Visual Studio 2019 16.6
* Bump verison.
| -rw-r--r-- | ports/libarchive/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libarchive/disable-c4061.patch | 14 | ||||
| -rw-r--r-- | ports/libarchive/portfile.cmake | 3 |
3 files changed, 17 insertions, 2 deletions
diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL index 425c2c72c..e3e821191 100644 --- a/ports/libarchive/CONTROL +++ b/ports/libarchive/CONTROL @@ -1,5 +1,5 @@ Source: libarchive
-Version: 3.4.1-2
+Version: 3.4.1-3
Homepage: https://github.com/libarchive/libarchive
Description: Library for reading and writing streaming archives
Build-Depends: zlib
diff --git a/ports/libarchive/disable-c4061.patch b/ports/libarchive/disable-c4061.patch new file mode 100644 index 000000000..e09c9ca6e --- /dev/null +++ b/ports/libarchive/disable-c4061.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 911ae5b..0e12b56 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -151,9 +151,6 @@ IF (MSVC) + ################################################################# + # Set compile flags for debug build. + # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug" +- # Enable level 4 C4061: The enumerate has no associated handler in a switch +- # statement. +- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4061") + # Enable level 4 C4254: A larger bit field was assigned to a smaller bit + # field. + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4254") diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index 82834f5d0..a9bb4955c 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( fix-lz4.patch
fix-zstd.patch
fix-cpu-set.patch
+ disable-c4061.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -84,4 +85,4 @@ foreach(HEADER ${CURRENT_PACKAGES_DIR}/include/archive.h ${CURRENT_PACKAGES_DIR} file(WRITE ${HEADER} "${CONTENTS}")
endforeach()
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|