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

Revert iconv related changes in 1.80.0 Jamfile.v2 #6

Merged
merged 1 commit into from
Sep 6, 2022
Merged

Revert iconv related changes in 1.80.0 Jamfile.v2 #6

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
26 changes: 23 additions & 3 deletions recipes/boost/all/patches/1.80.0-locale-fail-on-missing-backend.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2
index 450ec87..ece28bf 100644
index 3c517c884..0f521dbcf 100644
--- a/libs/locale/build/Jamfile.v2
+++ b/libs/locale/build/Jamfile.v2
@@ -20,6 +20,7 @@ project /boost/locale
Expand All @@ -10,7 +10,27 @@ index 450ec87..ece28bf 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 ;
@@ -230,10 +231,37 @@ rule configure-full ( properties * : flags-only )
@@ -29,7 +30,8 @@ feature.feature boost.locale.winapi : on off : optional propagated ;

## iconv

-exe has_iconv : $(TOP)/build/has_iconv.cpp ;
+obj has_iconv_libc_obj : $(TOP)/build/has_iconv.cpp ;
+exe has_iconv : has_iconv_libc_obj ;
explicit has_iconv ;

ICONV_PATH = [ modules.peek : ICONV_PATH ] ;
@@ -43,7 +45,8 @@ lib iconv

explicit iconv ;

-exe has_external_iconv : $(TOP)/build/has_iconv.cpp iconv ;
+obj has_iconv_libc_ext : $(TOP)/build/has_iconv.cpp iconv ;
+exe has_external_iconv : has_iconv_libc_ext iconv ;
explicit has_external_iconv ;

exe accepts_shared_option : $(TOP)/build/option.cpp
@@ -230,10 +233,37 @@ rule configure-full ( properties * : flags-only )
if [ configure.builds has_iconv : $(properties) : "iconv (libc)" ]
{
found-iconv = true ;
Expand Down Expand Up @@ -51,7 +71,7 @@ index 450ec87..ece28bf 100644
}
}
if $(found-iconv)
@@ -273,6 +301,10 @@ rule configure-full ( properties * : flags-only )
@@ -273,6 +303,10 @@ rule configure-full ( properties * : flags-only )
<library>/boost/thread//boost_thread
;
}
Expand Down