-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[boost-locale] Fix boost-locale failing to build with ICU #10943
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
2c03e7c
Apply patch to build boost-locale with ICU
Victor-Bergman a53f2c4
Merge remote-tracking branch 'upstream/master'
Victor-Bergman 86bd8b2
Make PR requested changes to boost-locale portfile
Victor-Bergman c1e257b
Change boost-locale version to 1.72.0-1
Victor-Bergman ca532a4
Merge from master
PhoebeHui 8936460
bump the version in CONTROL file
PhoebeHui File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.