[GitHub] mengzhugithub closed pull request #307: Generated a new bundle of Boost headers.

[GitBox <gi...@apache.org>]

mengzhugithub closed pull request #307: Generated a new bundle of Boost headers.
URL: https://github.com/apache/mesos/pull/307
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/3rdparty/boost-1.65.0.tar.gz b/3rdparty/boost-1.65.0.tar.gz
index 25973f3ec5..e9f02d71e8 100644
Binary files a/3rdparty/boost-1.65.0.tar.gz and b/3rdparty/boost-1.65.0.tar.gz differ
diff --git a/3rdparty/boost.md b/3rdparty/boost.md
new file mode 100644
index 0000000000..e6373f295b
--- /dev/null
+++ b/3rdparty/boost.md
@@ -0,0 +1,41 @@
+# Boost
+
+README for the Mesos third party Boost distribution.
+
+We use the Boost `bcp` utility to bundle only the minimum subset of Boost headers used by Mesos.
+See: http://www.boost.org/doc/libs/1_65_0/tools/bcp/doc/html/index.html
+
+## Instructions for upgrading Boost. (Based on Boost 1.65.0)
+```
+# Download Boost tarball e.g. boost_1_65_0.tar.gz
+
+# Uncompress Boost and build bcp.
+   $ tar -zxvf boost_1_65_0.tar.gz
+   $ cd boost_1_65_0
+   $ ./bootstrap.sh
+   $ ./b2 tools/bcp
+
+# Get list of all C++ source files in Mesos.
+   $ find </path/to/mesos> -name "*.cpp" -o -name "*.hpp" > files.txt
+
+# Scan the source files using bcp to produce a subset of the headers.
+   $ mkdir ../boost-1.65.0
+   $ cat files.txt | xargs -I {} ./dist/bin/bcp --scan --boost=./ {} ../boost-1.65.0
+
+# Inspect contents of extracted headers and remove unnecessary lib files.
+   $ cd ../boost-1.65.0
+   $ rm -r libs
+
+# Compress Boost directory and bundle it into Mesos.
+   $ cd ..
+   $ GZIP=--best tar -zcf boost-1.65.0.tar.gz boost-1.65.0
+   $ cp boost-1.65.0.tar.gz </path/to/mesos>/3rdparty/
+
+# Update 3rdparty/cmake/Versions.cmake with the new version and
+#  its SHA-256 hash. You can obtain the hash as follows, make sure
+#  to do this on the stripped release:
+  $ openssl sha -sha256 3rdparty/boost-1.65.0.tar.gz
+
+
+# Update this README if needed.
+```
diff --git a/3rdparty/cmake/Versions.cmake b/3rdparty/cmake/Versions.cmake
index c65d7b3d2d..a1c8184f2a 100644
--- a/3rdparty/cmake/Versions.cmake
+++ b/3rdparty/cmake/Versions.cmake
@@ -1,5 +1,5 @@
 set(BOOST_VERSION           "1.65.0")
-set(BOOST_HASH              "SHA256=085A1696AE2E735AACD0A497d46AACD7EEC0476E0D39937162F642B92F406476")
+set(BOOST_HASH              "SHA256=0442df595dc56e7da11665120ce9d92ec40c192eb060488131b346bac0938ba3")
 set(CONCURRENTQUEUE_VERSION "7b69a8f")
 set(CONCURRENTQUEUE_HASH    "SHA256=B2741A1FB2172C2A829503A85D5EE7548BE7ED04236A3FD1EFD2B6088E065CB7")
 set(CSI_VERSION             "0.2.0")


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services