Skip to content
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.

Sign up for GitHub

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

boost: checking libiconv exists even if libc already found #7908

Merged
merged 1 commit into from
Nov 13, 2021
Merged

boost: checking libiconv exists even if libc already found #7908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion recipes/boost/all/patches/1.69.0-locale-no-system.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
This library links to boost_system, even though that library is header-only.
--- libs/locale/build/Jamfile.v2
+++ libs/locale/build/Jamfile.v2
@@ -403,7 +403,7 @@
@@ -410,7 +410,7 @@
result += <source>util/gregorian.cpp ;
}

Expand Down
15 changes: 11 additions & 4 deletions recipes/boost/all/patches/boost_locale_fail_on_missing_backend.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,21 @@ index 578e722..b715f59 100644
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 ;
@@ -217,6 +218,14 @@ rule configure-full ( properties * : flags-only )
@@ -217,6 +217,21 @@ rule configure-full ( properties * : flags-only )
if [ configure.builds has_iconv : $(properties) : "iconv (libc)" ]
{
found-iconv = true ;
+ if <boost.locale.iconv.lib>libiconv in $(properties)
+ {
+ EXIT "- Boost.Locale found iconv (libc) instead of iconv (separate) library to be built." ;
+ }
+ {
+ if [ configure.builds has_external_iconv : $(properties) : "iconv (separate)" ]
+ {
+ result += <library>iconv ;
+ }
+ else
+ {
+ EXIT "- Boost.Locale found iconv (libc) instead of iconv (separate) library to be built." ;
+ }
+ }
+ }
+ else if <boost.locale.iconv.lib>libc in $(properties)
+ {
Expand Down