Update boost to 1.78 (#101)

Removed outdated patches: boost-1-69-remove-pending-integer_log2-include.patch - already included in new boost versions boost-1-69-mac-compiler-flags.patch - not sure why it was needed, since we don't build boost with GCC Updated to new boost version: boost-1-78-add-arm64-instruction-set.patch - patched files were updated, so need to adjust patch also.
yugabyte · Feb 23, 2022 · 16e9b78 · 16e9b78
1 parent 8050ff4
commit 16e9b78
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/patches/boost-1-78-add-arm64-instruction-set.patch b/patches/boost-1-78-add-arm64-instruction-set.patch
@@ -0,0 +1,6 @@
+--- a/tools/build/src/tools/features/instruction-set-feature.jam
++++ b/tools/build/src/tools/features/instruction-set-feature.jam
+64c64
+<         armv7 armv7s
+---
+>         armv7 armv7s arm64
diff --git a/python/build_definitions/boost.py b/python/build_definitions/boost.py
@@ -31,7 +31,7 @@
 
 class BoostDependency(Dependency):
     MAJOR_VERSION = 1
-    MINOR_VERSION = 69
+    MINOR_VERSION = 78
     PATCH_VERSION = 0
     VERSION_TUPLE = (MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION)
     VERSION_STR = "%s.%s.%s" % VERSION_TUPLE
@@ -48,10 +48,7 @@ def __init__(self) -> None:
             license='Boost Software License 1.0')
         self.dir = '{}_{}'.format(self.name, self.underscored_version)
         self.copy_sources = True
-        self.patches = ['boost-1-69-remove-pending-integer_log2-include.patch',
-                        'boost-1-69-mac-compiler-flags.patch']
-        if is_macos_arm64_build():
-            self.patches.append('boost-1-69-add-arm64-instruction-set.patch')
+        self.patches = ['boost-1-78-add-arm64-instruction-set.patch']
 
     def build(self, builder: BuilderInterface) -> None:
         libs = ['system', 'thread', 'atomic', 'program_options', 'regex', 'date_time']

diff --git a/thirdparty_src_checksums.txt b/thirdparty_src_checksums.txt
@@ -3,6 +3,7 @@
 430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778  boost-1.70.0.tar.bz2
 d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee  boost-1.71.0.tar.bz2
 fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854  boost-1.77.0.tar.bz2
+8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc  boost-1.78.0.tar.bz2
 7bc4b0257d4c15676a158dd30b665d85c1c6a590548e9f6288e2f1542ca6e05a  cassandra-cpp-driver-2.9.0-yb-12.tar.gz
 48dbb1e29028c2caeed6e6c6ec45a5deb0c18955f0292899e1994dd89defc3db  cassandra-cpp-driver-2.9.0-yb-13.tar.gz
 e97dc472aae52197a4d5e0185eb8f9e04d7575d2dc2b12194ddc768e0f8a846d  cfe-7.1.0.tar.xz