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

add patch for Boost 1.74.0 to fix missing include file #12007

Merged
merged 2 commits into from
Jan 15, 2021
Merged

add patch for Boost 1.74.0 to fix missing include file #12007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69490b3
patch of a missing include file. this bug has been fixed in 1.75.0 ht…
Jan 15, 2021
39cecca
add missing comment to patch for Boost 1.74.0, also apply patch in ea…
boegel Jan 15, 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
7 changes: 6 additions & 1 deletion easybuild/easyconfigs/b/Boost/Boost-1.74.0-GCC-10.2.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ toolchainopts = {'pic': True}

source_urls = ['https://dl.bintray.com/boostorg/release/%(version)s/source/']
sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
checksums = ['afff36d392885120bcac079148c177d1f6f7730ec3d47233aa51b0afa4db94a5']
patches = ['Boost-%(version)s-library_version_type_serialization.patch']
checksums = [
'afff36d392885120bcac079148c177d1f6f7730ec3d47233aa51b0afa4db94a5', # boost_1_74_0.tar.gz
# Boost-1.74.0-library_version_type_serialization.patch
'ee61e889ce9473ad82b69c9a8cbe1bf9650d633b74fdf7e4f4a4825aa990feca',
]

dependencies = [
('bzip2', '1.0.8'),
Expand Down
7 changes: 6 additions & 1 deletion easybuild/easyconfigs/b/Boost/Boost-1.74.0-iccifort-2020.4.304.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@ toolchainopts = {'pic': True, 'extra_cxxflags': '-DBOOST_ASIO_USE_TS_EXECUTOR_AS

source_urls = ['https://dl.bintray.com/boostorg/release/%(version)s/source/']
sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
checksums = ['afff36d392885120bcac079148c177d1f6f7730ec3d47233aa51b0afa4db94a5']
patches = ['Boost-%(version)s-library_version_type_serialization.patch']
checksums = [
'afff36d392885120bcac079148c177d1f6f7730ec3d47233aa51b0afa4db94a5', # boost_1_74_0.tar.gz
# Boost-1.74.0-library_version_type_serialization.patch
'ee61e889ce9473ad82b69c9a8cbe1bf9650d633b74fdf7e4f4a4825aa990feca',
]

dependencies = [
('bzip2', '1.0.8'),
Expand Down
12 changes: 12 additions & 0 deletions easybuild/easyconfigs/b/Boost/Boost-1.74.0-library_version_type_serialization.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
add missing include (fixed in Boost 1.75.0), see https://github.com/boostorg/serialization/issues/219
diff -rub serialization-boost-1.74.0_orig/include/boost/serialization/set.hpp serialization-boost-1.74.0/include/boost/serialization/set.hpp
boegel marked this conversation as resolved.
Show resolved Hide resolved
--- serialization-boost-1.74.0_orig/include/boost/serialization/set.hpp 2021-01-15 12:44:36.914487928 +0100
+++ serialization-boost-1.74.0/include/boost/serialization/set.hpp 2021-01-15 12:46:08.298821841 +0100
@@ -25,6 +25,7 @@
#include <boost/serialization/detail/stack_constructor.hpp>
#include <boost/serialization/collection_size_type.hpp>
#include <boost/serialization/item_version_type.hpp>
+#include <boost/serialization/library_version_type.hpp>

#include <boost/serialization/collections_save_imp.hpp>
#include <boost/serialization/split_free.hpp>