diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-06-30 21:05:51 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-07-02 22:16:47 -0700 |
| commit | b08e78b07d4340a537f8d1470137883775a8902a (patch) | |
| tree | 98e3e558875e42d4c0a4cef8c9e0cbbad720f25e /ports/libarchive | |
| parent | 3c16addc8c8e6516a4ee4edcb11c1fc428d38b96 (diff) | |
| download | vcpkg-b08e78b07d4340a537f8d1470137883775a8902a.tar.gz vcpkg-b08e78b07d4340a537f8d1470137883775a8902a.zip | |
[cmark][gl3w][libpopt][libraw][libssh][live555] Fixes, mostly around changing download locations.
Diffstat (limited to 'ports/libarchive')
| -rw-r--r-- | ports/libarchive/no-werror.patch | 22 | ||||
| -rw-r--r-- | ports/libarchive/portfile.cmake | 9 |
2 files changed, 26 insertions, 5 deletions
diff --git a/ports/libarchive/no-werror.patch b/ports/libarchive/no-werror.patch new file mode 100644 index 000000000..fbd3be8c6 --- /dev/null +++ b/ports/libarchive/no-werror.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 745dc29..820c56f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -96,7 +96,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
+ #################################################################
+ # Set compile flags for debug build.
+ # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
+- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
++ #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
+@@ -112,7 +112,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^Clang$")
+ # Set compile flags for debug build.
+ # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
+- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
++ #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index d361b7da8..1e36af1bb 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -9,14 +9,13 @@ vcpkg_from_github( REPO libarchive/libarchive
REF v3.3.2
SHA512 7bc17d6f742080278e35f86b0233d70045df0ca1578cd427126e0acce183709bf33ecca689db65e2e67bdfaf687c04d36cae1202a926beeebc88076648aa40bc
- HEAD_REF master)
-
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
+ HEAD_REF master
PATCHES
${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch
${CMAKE_CURRENT_LIST_DIR}/fix-dependencies.patch
- ${CMAKE_CURRENT_LIST_DIR}/fix-lz4.patch)
+ ${CMAKE_CURRENT_LIST_DIR}/fix-lz4.patch
+ ${CMAKE_CURRENT_LIST_DIR}/no-werror.patch
+)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
|