Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ports/libunistring/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,20 @@ vcpkg_download_distfile(ARCHIVE
SHA512 5fbb5a0a864db73a6d18cdea7b31237da907fff0ef288f3a8db6ebdba8ef61ad8855e5fc780c2bbf632218d8fa59dd119734e5937ca64dc77f53f30f13b80b17
)

if(VCPKG_TARGET_IS_WINDOWS)
list(APPEND OPTIONS
# On windows during configure tests iconv is properly linked,
# but iconv-2.dll missing from the directory where check program is built
# causes one of the tests to fail and in result builds libunistring
# without iconv support, this flag allows to bypass the test.
#
# The failing test is "checking for working iconv", while in previous
# test "checking for iconv", configure only checks linking, in
# "checking for working iconv" it also runs resulting test application.
am_cv_func_iconv_works=yes
)
endif()

vcpkg_extract_source_archive(SOURCE_PATH
ARCHIVE "${ARCHIVE}"
SOURCE_BASE "v${VERSION}"
Expand All @@ -22,6 +36,8 @@ vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
AUTOCONFIG
USE_WRAPPERS
OPTIONS
${OPTIONS}
OPTIONS
"--with-libiconv-prefix=${CURRENT_INSTALLED_DIR}"
)
Expand Down
2 changes: 1 addition & 1 deletion ports/libunistring/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libunistring",
"version": "1.2",
"port-version": 2,
"port-version": 3,
"description": "GNU libunistring provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.",
"homepage": "https://www.gnu.org/software/libunistring/",
"license": "LGPL-3.0-or-later OR GPL-2.0-or-later",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5614,7 +5614,7 @@
},
"libunistring": {
"baseline": "1.2",
"port-version": 2
"port-version": 3
},
"libunwind": {
"baseline": "1.8.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libunistring.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6b9c1ea458081c9560f174576432f07feba1f50e",
"version": "1.2",
"port-version": 3
},
{
"git-tree": "2d4c1b3ca54d175219e941aa7c10fa90a7703d57",
"version": "1.2",
Expand Down
Loading