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

Jump to bottom

- [boost] fix libiconv detection (needed by boost locale) for iOS, Android #7146

Merged
merged 10 commits into from
Sep 10, 2021
Merged

- [boost] fix libiconv detection (needed by boost locale) for iOS, Android #7146

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
817c50c
- [boost] fix libiconv detection (needed by boost locale) for iOS
SSE4 Sep 2, 2021
2dd5bf8
- fix libiconv for Android (api_level < 28)
SSE4 Sep 2, 2021
2354b2c
- we can't upgrade CMake in CCI right now, so build requires recent e…
SSE4 Sep 3, 2021
3e05a76
- add AppleTV
SSE4 Sep 3, 2021
292077a
- fix catalyst build
SSE4 Sep 3, 2021
af81a43
- addr2line is not available in sandboxed environments
SSE4 Sep 3, 2021
fd6420f
- respect option with_stacktrace_backtrace
SSE4 Sep 3, 2021
ca995f6
- cmake build requirement belongs to the test_package
SSE4 Sep 4, 2021
0fab148
- don't expose addr2line component for iOS/Catalyst
SSE4 Sep 4, 2021
23c0989
- define BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED for FreeBSD as well
SSE4 Sep 4, 2021
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
15 changes: 14 additions & 1 deletion recipes/boost/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,13 @@ def config_options(self):
# iconv is off by default on Windows and Solaris
if self._is_windows_platform or self.settings.os == "SunOS":
self.options.i18n_backend_iconv = "off"
elif self.settings.os == "Macos":
elif tools.is_apple_os(self.settings.os):
self.options.i18n_backend_iconv = "libiconv"
elif self.settings.os == "Android":
# bionic provides iconv since API level 28
api_level = self.settings.get_safe("os.api_level")
if api_level and tools.Version(api_level) < "28":
self.options.i18n_backend_iconv = "libiconv"

# Remove options not supported by this version of boost
for dep_name in CONFIGURE_OPTIONS:
Expand Down Expand Up @@ -778,6 +783,14 @@ def build(self):
"thread_local", "/* thread_local */")
tools.replace_in_file(os.path.join(self.source_folder, self._source_subfolder, "boost", "stacktrace", "detail", "libbacktrace_impls.hpp"),
"static __thread", "/* static __thread */")
tools.replace_in_file(os.path.join(self.source_folder, self._source_subfolder, "tools", "build", "src", "tools", "gcc.jam"),
"local generic-os = [ set.difference $(all-os) : aix darwin vxworks solaris osf hpux ] ;",
"local generic-os = [ set.difference $(all-os) : aix darwin vxworks solaris osf hpux iphone ] ;",
SSE4 marked this conversation as resolved.
Show resolved Hide resolved
strict=False)
tools.replace_in_file(os.path.join(self.source_folder, self._source_subfolder, "tools", "build", "src", "tools", "gcc.jam"),
"local no-threading = android beos haiku sgi darwin vxworks ;",
"local no-threading = android beos haiku sgi darwin vxworks iphone ;",
SSE4 marked this conversation as resolved.
Show resolved Hide resolved
strict=False)

if self.options.header_only:
self.output.warn("Header only package, skipping build")
Expand Down