diff options
| author | stoperro <stoperro@users.noreply.github.com> | 2020-10-28 22:22:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-28 14:22:51 -0700 |
| commit | 318a8adbd03bebec860a33335f538b557ec94cf9 (patch) | |
| tree | 504cac7756914ee00add34991907d6ecb792ccef /ports/boost-locale | |
| parent | 09a647a5261e981cbbc8219292c838490ed0b06f (diff) | |
| download | vcpkg-318a8adbd03bebec860a33335f538b557ec94cf9.tar.gz vcpkg-318a8adbd03bebec860a33335f538b557ec94cf9.zip | |
[boost] Enable Boost building with wasm32-emscripten (#14102)
Diffstat (limited to 'ports/boost-locale')
| -rw-r--r-- | ports/boost-locale/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-locale/allow-force-finding-iconv.patch | 24 | ||||
| -rw-r--r-- | ports/boost-locale/b2-options.cmake | 7 | ||||
| -rw-r--r-- | ports/boost-locale/portfile.cmake | 3 |
4 files changed, 33 insertions, 3 deletions
diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL index 5260cea4c..d0136ce7a 100644 --- a/ports/boost-locale/CONTROL +++ b/ports/boost-locale/CONTROL @@ -1,7 +1,7 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-locale
Version: 1.73.0
-Port-Version: 1
+Port-Version: 2
Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows)
Homepage: https://github.com/boostorg/locale
Description: Boost locale module
diff --git a/ports/boost-locale/allow-force-finding-iconv.patch b/ports/boost-locale/allow-force-finding-iconv.patch new file mode 100644 index 000000000..134cb81a1 --- /dev/null +++ b/ports/boost-locale/allow-force-finding-iconv.patch @@ -0,0 +1,24 @@ +diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2 +index 88a8cb1..e6a6b7f 100644 +--- a/build/Jamfile.v2 ++++ b/build/Jamfile.v2 +@@ -17,6 +17,7 @@ import feature ; + # Features + + feature.feature boost.locale.iconv : on off : optional propagated ; ++feature.feature boost.locale.force-found-iconv : on off : optional propagated ; + feature.feature boost.locale.icu : on off : optional propagated ; + feature.feature boost.locale.posix : on off : optional propagated ; + feature.feature boost.locale.std : on off : optional propagated ; +@@ -164,6 +164,11 @@ local flags-result ; + + local found-iconv ; + ++ if <boost.locale.force-found-iconv>on in $(properties) ++ { ++ found-iconv = true ; ++ } ++ + if <boost.locale.iconv>on in $(properties) + || ! <boost.locale.iconv> in $(properties:G) + && ! <target-os>solaris in $(properties) diff --git a/ports/boost-locale/b2-options.cmake b/ports/boost-locale/b2-options.cmake index 0a7deddca..6bd353e1d 100644 --- a/ports/boost-locale/b2-options.cmake +++ b/ports/boost-locale/b2-options.cmake @@ -22,4 +22,9 @@ else() boost.locale.icu=off
-sICONV_PATH=${LIBICONV_DIR}
)
-endif()
\ No newline at end of file + if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")
+ list(APPEND B2_OPTIONS
+ boost.locale.force-found-iconv=on
+ )
+ endif()
+endif()
diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index 65df1f7c9..8171f3b0d 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -6,7 +6,8 @@ vcpkg_from_github( REF boost-1.73.0
SHA512 0af88d8db7b18395a2b3668bcb51a5f32cd0de9acb9633572c2fb7edcdf06f354802392606394cf75ec4fd4d9cfe5c96351db766e55f8ef30f746b0a7017ad1f
HEAD_REF master
- PATCHES 0001-Fix-boost-ICU-support.patch
+ PATCHES
+ 0001-Fix-boost-ICU-support.patch allow-force-finding-iconv.patch
)
include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
|