Skip to content

Commit e00f7b0

Browse files
committed
Issue-4402 Boost compile error on macOS Catalina
Patch boost build from boostorg/build#560
1 parent 4c3da93 commit e00f7b0

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

build_definitions/boost.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ def __init__(self):
3838
BUILD_GROUP_INSTRUMENTED)
3939
self.dir = '{}_{}'.format(self.name, self.underscored_version)
4040
self.copy_sources = True
41-
self.patches = ['boost-1-69-remove-pending-integer_log2-include.patch']
41+
self.patches = ['boost-1-69-remove-pending-integer_log2-include.patch',
42+
'boost-1-69-mac-compiler-flags.patch']
4243
self.patch_strip = 1
4344

4445
def build(self, builder):
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
diff --git a/darwin.orig b/darwin.jam
2+
index 8d477410b..97e7ecb85 100644
3+
--- a/tools/build/src/tools/darwin.jam
4+
+++ b/tools/build/src/tools/darwin.jam
5+
@@ -137,13 +137,14 @@ rule init ( version ? : command * : options * : requirement * )
6+
# - Set the toolset generic common options.
7+
common.handle-options darwin : $(condition) : $(command) : $(options) ;
8+
9+
+ real-version = [ regex.split $(real-version) \\. ] ;
10+
# - GCC 4.0 and higher in Darwin does not have -fcoalesce-templates.
11+
- if $(real-version) < "4.0.0"
12+
+ if [ version.version-less $(real-version) : 4 0 ]
13+
{
14+
flags darwin.compile.c++ OPTIONS $(condition) : -fcoalesce-templates ;
15+
}
16+
# - GCC 4.2 and higher in Darwin does not have -Wno-long-double.
17+
- if $(real-version) < "4.2.0"
18+
+ if [ version.version-less $(real-version) : 4 2 ]
19+
{
20+
flags darwin.compile OPTIONS $(condition) : -Wno-long-double ;
21+
}

0 commit comments

Comments
 (0)