early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,100 @@
---
libs/locale/build/Jamfile.v2 | 63 ++++++--------------------------------
libs/locale/build/has_icu_test.cpp | 4 ---
libs/regex/build/Jamfile.v2 | 47 +++++++---------------------
3 files changed, 20 insertions(+), 94 deletions(-)
diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2
index 578e722..5f25917 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -70,62 +70,17 @@ if $(ICU_LINK)
}
else
{
- searched-lib icuuc : : <name>icuuc
- <search>$(ICU_PATH)/lib
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icuuc : : <toolset>msvc
- <variant>debug
- <name>icuucd
- <search>$(ICU_PATH)/lib
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icuuc : : <name>this_is_an_invalid_library_name ;
-
- searched-lib icudt : : <search>$(ICU_PATH)/lib
- <name>icudata
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icudt : : <search>$(ICU_PATH)/lib
- <name>icudt
- <toolset>msvc
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icudt : : <name>this_is_an_invalid_library_name ;
-
- searched-lib icuin : : <search>$(ICU_PATH)/lib
- <name>icui18n
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icuin : : <toolset>msvc
- <variant>debug
- <name>icuind
- <search>$(ICU_PATH)/lib
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icuin : : <toolset>msvc
- <variant>release
- <name>icuin
- <search>$(ICU_PATH)/lib
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icuin : : <name>this_is_an_invalid_library_name ;
-
- explicit icuuc icudt icuin ;
+ alias icuuc : /user-config//icuuc ;
+ alias icuin : /user-config//icuin ;
+ alias icudt : /user-config//icudt ;
+
+ explicit icuuc icuin icudt ;
ICU_OPTS = <include>$(ICU_PATH)/include
- <library>icuuc/<link>shared/<runtime-link>shared
- <library>icudt/<link>shared/<runtime-link>shared
- <library>icuin/<link>shared/<runtime-link>shared
- <dll-path>$(ICU_PATH)/bin
- <runtime-link>shared ;
+ <library>icuuc
+ <library>icuin
+ <library>icudt
+ <dll-path>$(ICU_PATH)/bin ;
diff --git a/libs/locale/build/has_icu_test.cpp b/libs/locale/build/has_icu_test.cpp
index 9419b30..ed9be05 100644
--- a/build/has_icu_test.cpp
+++ b/build/has_icu_test.cpp
@@ -15,10 +15,6 @@
#include <unicode/uchar.h>
#include <unicode/coll.h>
-#if defined(_MSC_VER) && !defined(_DLL)
-#error "Mixing ICU with a static runtime doesn't work"
-#endif
-
int main()
{
icu::Locale loc;
--
2.12.2.windows.2

View File

@@ -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)

View File

@@ -0,0 +1,42 @@
set(_B2_OPTIONS_FEATURES "@FEATURES@")
if("icu" IN_LIST _B2_OPTIONS_FEATURES)
set(BOOST_LOCALE_ENABLE_ICU on)
else()
set(BOOST_LOCALE_ENABLE_ICU off)
endif()
if(@VCPKG_TARGET_IS_WINDOWS@)
set(BOOST_LOCALE_ENABLE_ICONV off)
set(BOOST_LOCALE_ENABLE_POSIX off)
set(BOOST_LOCALE_ENABLE_WINAPI on)
else()
find_library(VCPKG_ICONV_LIBRARY_RELEASE iconv PATHS "${CURRENT_INSTALLED_DIR}/lib/" NO_DEFAULT_PATH)
find_library(VCPKG_ICONV_LIBRARY_DEBUG iconv PATHS "${CURRENT_INSTALLED_DIR}/debug/lib/" NO_DEFAULT_PATH)
set(BOOST_LOCALE_ENABLE_ICONV on)
if(@VCPKG_TARGET_IS_ANDROID@)
set(BOOST_LOCALE_ENABLE_POSIX off)
else()
set(BOOST_LOCALE_ENABLE_POSIX on)
endif()
set(BOOST_LOCALE_ENABLE_WINAPI off)
endif()
list(APPEND B2_OPTIONS
boost.locale.iconv=${BOOST_LOCALE_ENABLE_ICONV}
boost.locale.icu=${BOOST_LOCALE_ENABLE_ICU}
boost.locale.posix=${BOOST_LOCALE_ENABLE_POSIX}
boost.locale.winapi=${BOOST_LOCALE_ENABLE_WINAPI}
/boost/locale//boost_locale
)
if(BOOST_LOCALE_ENABLE_ICONV)
list(APPEND B2_OPTIONS
-sICONV_PATH=${CURRENT_INSTALLED_DIR}
)
if(VCPKG_TARGET_IS_OSX OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")
list(APPEND B2_OPTIONS
boost.locale.force-found-iconv=on
)
endif()
endif()

View File

@@ -0,0 +1,25 @@
# Automatically generated by scripts/boost/generate-ports.ps1
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/locale
REF boost-1.79.0
SHA512 2f036406e8343895b3749bd7769b1dadb48d7552862898842b43eccf51c62153f4683c46cef91fd97228d6022e60a9bdb0726a00bcc74f519e0539b3a69dc0bf
HEAD_REF master
PATCHES
0001-Fix-boost-ICU-support.patch
allow-force-finding-iconv.patch
)
include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
configure_file(
"${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in"
"${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"
@ONLY
)
boost_modular_build(
SOURCE_PATH ${SOURCE_PATH}
BOOST_CMAKE_FRAGMENT "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

44
externals/vcpkg/ports/boost-locale/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,44 @@
{
"name": "boost-locale",
"version": "1.79.0",
"description": "Boost locale module",
"homepage": "https://github.com/boostorg/locale",
"license": "BSL-1.0",
"supports": "!uwp",
"dependencies": [
"boost-assert",
{
"name": "boost-build",
"host": true
},
"boost-config",
"boost-function",
"boost-iterator",
{
"name": "boost-modular-build-helper",
"host": true
},
"boost-smart-ptr",
"boost-static-assert",
"boost-thread",
"boost-type-traits",
"boost-unordered",
"boost-vcpkg-helpers",
{
"name": "libiconv",
"platform": "!uwp & !windows & !mingw"
},
{
"name": "vcpkg-cmake",
"host": true
}
],
"features": {
"icu": {
"description": "ICU backend for Boost.Locale",
"dependencies": [
"icu"
]
}
}
}