diff options
| author | codicodi <rob.ceglinski@gmail.com> | 2017-05-10 18:20:37 +0200 |
|---|---|---|
| committer | codicodi <rob.ceglinski@gmail.com> | 2017-05-10 18:20:37 +0200 |
| commit | b1110308f609b73ee57bcbe6720bdbb24e64de9a (patch) | |
| tree | 5e99c69721c0986e6ac596386295ea20ed27f341 | |
| parent | 61766d1dc9e356f5cb533b49beab35b84fceb473 (diff) | |
| download | vcpkg-b1110308f609b73ee57bcbe6720bdbb24e64de9a.tar.gz vcpkg-b1110308f609b73ee57bcbe6720bdbb24e64de9a.zip | |
[libarchive] fix list of dependencies
| -rw-r--r-- | ports/libarchive/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libarchive/fix-dependencies.patch | 13 | ||||
| -rw-r--r-- | ports/libarchive/portfile.cmake | 3 |
3 files changed, 16 insertions, 2 deletions
diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL index ff9669fc7..f4f9b8cdd 100644 --- a/ports/libarchive/CONTROL +++ b/ports/libarchive/CONTROL @@ -1,4 +1,4 @@ Source: libarchive
-Version: 3.3.1
+Version: 3.3.1-1
Description: Library for reading and writing streaming archives
Build-Depends: zlib, bzip2, libxml2, lz4, liblzma, openssl
diff --git a/ports/libarchive/fix-dependencies.patch b/ports/libarchive/fix-dependencies.patch new file mode 100644 index 000000000..2a18d55a5 --- /dev/null +++ b/ports/libarchive/fix-dependencies.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 61c3b2a..c47b5b4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -783,7 +783,7 @@ main(int argc, char **argv) + IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) + INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES}) +- LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS) ++ #LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS) + ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) + ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}) + ENDIF(NOT ARCHIVE_CRYPTO_${ALGORITHM}) diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index c63bb3b56..72958dfda 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -15,7 +15,8 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
- ${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch)
+ ${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch
+ ${CMAKE_CURRENT_LIST_DIR}/fix-dependencies.patch)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
|