diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-01-25 21:14:57 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-01-25 21:14:57 -0800 |
| commit | 490ddfe2f7362c442190f4da9e41386a8a811681 (patch) | |
| tree | 34e2bc44ca8d2663b78069fa86cf8d92d0866450 | |
| parent | cf5770d2641bb56830f0ef27ee604313b20b9cb1 (diff) | |
| download | vcpkg-490ddfe2f7362c442190f4da9e41386a8a811681.tar.gz vcpkg-490ddfe2f7362c442190f4da9e41386a8a811681.zip | |
[libarchive] Disable libiconv support
This fixes an issue with the detection code on VS2017. Additionally, it appears that the functionality provided by libiconv is minimal on Windows due to the existance of the Win32 conversion APIs.
| -rw-r--r-- | ports/libarchive/CONTROL | 4 | ||||
| -rw-r--r-- | ports/libarchive/portfile.cmake | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL index 43979243c..96f2de7dd 100644 --- a/ports/libarchive/CONTROL +++ b/ports/libarchive/CONTROL @@ -1,4 +1,4 @@ Source: libarchive
-Version: 3.2.2-1
+Version: 3.2.2-2
Description: Library for reading and writing streaming archives
-Build-Depends: zlib, bzip2, libxml2, libiconv, lz4, liblzma, openssl
+Build-Depends: zlib, bzip2, libxml2, lz4, liblzma, openssl
diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index 731174790..5a60f1d6d 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -33,6 +33,7 @@ vcpkg_configure_cmake( -DENABLE_XATTR=OFF
-DENABLE_ACL=OFF
-DENABLE_TEST=OFF
+ -DENABLE_ICONV=OFF
-DPOSIX_REGEX_LIB=NONE
OPTIONS_DEBUG
-DARCHIVE_SKIP_HEADERS=ON)
|