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.

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

boost: update to 1.71.0 #5086

Merged
merged 1 commit into from
Aug 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
55 changes: 30 additions & 25 deletions devel/boost/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ PortGroup active_variants 1.1

name boost

version 1.70.0
version 1.71.0
# Revision is set below in the `if {$subport eq $name} { ... }` statement
# The boost-numpy subport has its own revision number
checksums rmd160 83440e32058f68390b979b88b116daa971f19c86 \
sha256 430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778 \
size 97887058
checksums rmd160 a46b886ca26993610c84615fca4340ad3f955f81 \
sha256 d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee \
size 100124647

license Boost-1
categories devel
Expand Down Expand Up @@ -47,21 +47,19 @@ post-extract {
}
}

patchfiles patch-tools-build-src-engine-build.sh.diff \
patch-tools-build-src-engine-build.jam.diff \
patch-apple-clang-no-libcxx.diff

# patch-apple-clang-no-libcxx.diff fixes a clang configuration
# error that occurs on OS X 10.7 and 10.8 due to the assumption
# that if clang is the compiler in use it must be using libc++.
# Apple Clang uses libstdc++ by default on these OS versions.
# The patch adds an additional BOOST_* configuration flag
# that is set if Apple clang is being used but libc++
# is not. This flag is then used to prevent boost or a
# dependent package from using functions such as std::forward that
# are only available in libc++. Fixes build of libcdr on these
# OS versions without affecting build on 10.6 and less (where clang is not
# the default compiler) or 10.9 and up (where libc++ is the default).
# patch-apple-clang-no-libcxx.diff fixes a clang configuration error
# that occurs on OS X 10.7 and 10.8 due to the assumption that if
# clang is the compiler in use it must be using libc++. Apple Clang
# uses libstdc++ by default on these OS versions. The patch adds an
# additional BOOST_* configuration flag that is set if Apple clang is
# being used but libc++ is not. This flag is then used to prevent
# boost or a dependent package from using functions such as
# std::forward that are only available in libc++. Fixes build of
# libcdr on these OS versions without affecting build on 10.6 and less
# (where clang is not the default compiler) or 10.9 and up (where
# libc++ is the default).

patchfiles-append patch-apple-clang-no-libcxx.diff

# temporary patch to fix: explicit template instanciations in
# boost::serialization don't get exported with all compilers; this fix
Expand All @@ -80,11 +78,6 @@ patchfiles-append patch-export_serialization_explicit_template_instantiations.di
# p64, p32).
patchfiles-append patch-revert-lib-name-tagged.diff

post-patch {
reinplace "s|%%CONFIGURE.CC%%|${configure.cc}|g" ${worksrcpath}/tools/build/src/engine/build.jam \
${worksrcpath}/tools/build/src/engine/build.sh
}

proc write_jam s {
global worksrcpath
set config [open ${worksrcpath}/user-config.jam a]
Expand Down Expand Up @@ -166,7 +159,7 @@ build.args -d2 \
-j${build.jobs} \
--no-cmake-config

destroot.cmd ${worksrcpath}/bjam
destroot.cmd ${worksrcpath}/b2
destroot.post_args

pre-destroot {
Expand Down Expand Up @@ -437,3 +430,15 @@ platform darwin 8 powerpc {
build.args-append macosx-version=10.4
}
}

# As of Boost 1.70.0, Boost provides CMake find scripts for itself
# that are installed by default. Those provided in 1.70.0 were broken
# in multiple ways; many fixed were added before 1.71.0. That said,
# we're not installing them by default at this time, but instead
# providing an option to install them for testing / evaluation
# purposes. We will likely enable these scripts in the future since it
# is likely that CMake will stop providing them once the
# Boost-provided version is stable.
variant cmake_scripts description {Install Boost CMake find scripts} {
build.args-delete --no-cmake-config
}
11 changes: 0 additions & 11 deletions devel/boost/files/patch-tools-build-src-engine-build.jam.diff

This file was deleted.

11 changes: 0 additions & 11 deletions devel/boost/files/patch-tools-build-src-engine-build.sh.diff

This file was deleted.