diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/libiconv | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/libiconv')
| -rw-r--r-- | ports/libiconv/0003-Fix-uwp.patch | 25 | ||||
| -rw-r--r-- | ports/libiconv/portfile.cmake | 5 |
2 files changed, 1 insertions, 29 deletions
diff --git a/ports/libiconv/0003-Fix-uwp.patch b/ports/libiconv/0003-Fix-uwp.patch deleted file mode 100644 index 0b2444166..000000000 --- a/ports/libiconv/0003-Fix-uwp.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/libcharset/lib/localcharset.c b/libcharset/lib/localcharset.c -index 3aceb42..dadd95a 100644 ---- a/libcharset/lib/localcharset.c -+++ b/libcharset/lib/localcharset.c -@@ -455,7 +455,10 @@ locale_charset (void) - # endif - - #elif defined WIN32_NATIVE -- -+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) -+ // GetACP() not available to UWP apps -+ codeset = NULL; -+#else - static char buf[2 + 10 + 1]; - - /* Woe32 has a function returning the locale's codepage as a number: -@@ -467,7 +470,7 @@ locale_charset (void) - encoding is the best bet. */ - sprintf (buf, "CP%u", GetACP ()); - codeset = buf; -- -+#endif - #elif defined OS2 - - const char *locale; diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 4b84ecc5f..488cc3b2f 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -21,7 +21,6 @@ vcpkg_extract_source_archive_ex( PATCHES 0001-Add-export-definitions.patch 0002-Config-for-MSVC.patch - 0003-Fix-uwp.patch ) #Since libiconv uses automake, make and configure, we use a custom CMake file @@ -39,8 +38,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-iconv TARGET_PATH share/u vcpkg_copy_pdbs() -# Handle copyright -file(COPY ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/libiconv) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libiconv/COPYING.LIB ${CURRENT_PACKAGES_DIR}/share/libiconv/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_test_cmake(PACKAGE_NAME unofficial-iconv) |