summaryrefslogtreecommitdiff
path: root/devel/boost-libs/files
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2017-05-02 06:48:10 +0000
committerJan Beich <jbeich@FreeBSD.org>2017-05-02 06:48:10 +0000
commitb324ade02d984ecb2c343b4c786d74c25d16f914 (patch)
treeedc2817dd2a7952c08391fe099c4861b876b80a0 /devel/boost-libs/files
parentdevel/boost-*: partially revert r439920 (see r439922) (diff)
devel/boost-*: update to 1.64.0
Changes: http://www.boost.org/users/history/version_1_64_0.html PR: 218835 Approved by: office (bapt) Exp-run by: antoine Differential Revision: https://reviews.freebsd.org/D10472
Notes
Notes: svn path=/head/; revision=439934
Diffstat (limited to 'devel/boost-libs/files')
-rw-r--r--devel/boost-libs/files/patch-boost_asio_ssl_impl_context.ipp50
-rw-r--r--devel/boost-libs/files/patch-boost_serialization_array.hpp14
-rw-r--r--devel/boost-libs/files/patch-clang-as33
-rw-r--r--devel/boost-libs/files/patch-tools_build_src_tools_clang-linux.jam20
-rw-r--r--devel/boost-libs/files/patch-tools_build_src_tools_gcc.jam2
5 files changed, 25 insertions, 94 deletions
diff --git a/devel/boost-libs/files/patch-boost_asio_ssl_impl_context.ipp b/devel/boost-libs/files/patch-boost_asio_ssl_impl_context.ipp
deleted file mode 100644
index 4b7a654ed1f7..000000000000
--- a/devel/boost-libs/files/patch-boost_asio_ssl_impl_context.ipp
+++ /dev/null
@@ -1,50 +0,0 @@
-Ticket #12575 fix compilation of software using libressl and boost asio
-https://svn.boost.org/trac/boost/ticket/12575
-
---- boost/asio/ssl/impl/context.ipp.orig 2016-09-21 14:33:21 UTC
-+++ boost/asio/ssl/impl/context.ipp
-@@ -228,7 +228,7 @@ context::~context()
- {
- if (handle_)
- {
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
- void* cb_userdata = handle_->default_passwd_callback_userdata;
-@@ -578,7 +578,7 @@ boost::system::error_code context::use_c
- bio_cleanup bio = { make_buffer_bio(chain) };
- if (bio.p)
- {
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
- void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-@@ -682,7 +682,7 @@ boost::system::error_code context::use_p
- {
- ::ERR_clear_error();
-
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
- void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-@@ -749,7 +749,7 @@ boost::system::error_code context::use_r
- {
- ::ERR_clear_error();
-
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
- void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-@@ -988,7 +988,7 @@ int context::verify_callback_function(in
- boost::system::error_code context::do_set_password_callback(
- detail::password_callback_base* callback, boost::system::error_code& ec)
- {
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
- ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback);
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
diff --git a/devel/boost-libs/files/patch-boost_serialization_array.hpp b/devel/boost-libs/files/patch-boost_serialization_array.hpp
new file mode 100644
index 000000000000..3b8a84a619f0
--- /dev/null
+++ b/devel/boost-libs/files/patch-boost_serialization_array.hpp
@@ -0,0 +1,14 @@
+https://svn.boost.org/trac/boost/ticket/12982
+https://github.com/boostorg/serialization/commit/1d8626158123
+
+--- boost/serialization/array.hpp.orig 2017-04-17 02:22:24 UTC
++++ boost/serialization/array.hpp
+@@ -23,6 +23,8 @@ namespace std{
+ } // namespace std
+ #endif
+
++#include <boost/serialization/array_wrapper.hpp>
++
+ #ifndef BOOST_NO_CXX11_HDR_ARRAY
+
+ #include <array>
diff --git a/devel/boost-libs/files/patch-clang-as b/devel/boost-libs/files/patch-clang-as
deleted file mode 100644
index 569df677eb7a..000000000000
--- a/devel/boost-libs/files/patch-clang-as
+++ /dev/null
@@ -1,33 +0,0 @@
-https://svn.boost.org/trac/boost/ticket/12551
-https://github.com/boostorg/context/commit/26b61a67cf1d
-
---- libs/context/src/asm/jump_arm64_aapcs_elf_gas.S.orig 2016-09-21 14:33:22 UTC
-+++ libs/context/src/asm/jump_arm64_aapcs_elf_gas.S
-@@ -37,7 +37,6 @@
- * *
- *******************************************************/
-
--.cpu generic+fp+simd
- .text
- .align 2
- .global jump_fcontext
---- libs/context/src/asm/make_arm64_aapcs_elf_gas.S.orig 2016-09-21 14:33:22 UTC
-+++ libs/context/src/asm/make_arm64_aapcs_elf_gas.S
-@@ -37,7 +37,6 @@
- * *
- *******************************************************/
-
--.cpu generic+fp+simd
- .text
- .align 2
- .global make_fcontext
---- libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S.orig 2016-09-21 14:33:22 UTC
-+++ libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S
-@@ -37,7 +37,6 @@
- * *
- *******************************************************/
-
--.cpu generic+fp+simd
- .text
- .align 2
- .global ontop_fcontext
diff --git a/devel/boost-libs/files/patch-tools_build_src_tools_clang-linux.jam b/devel/boost-libs/files/patch-tools_build_src_tools_clang-linux.jam
index 5f25fd3e5823..4d0f5d0e2612 100644
--- a/devel/boost-libs/files/patch-tools_build_src_tools_clang-linux.jam
+++ b/devel/boost-libs/files/patch-tools_build_src_tools_clang-linux.jam
@@ -1,6 +1,6 @@
---- tools/build/src/tools/clang-linux.jam.orig 2016-09-21 14:33:28 UTC
+--- tools/build/src/tools/clang-linux.jam.orig 2017-04-17 02:22:26 UTC
+++ tools/build/src/tools/clang-linux.jam
-@@ -31,7 +31,7 @@ generators.override clang-linux.compile.
+@@ -31,7 +31,7 @@ generators.override clang-linux.compile.c.pch : pch.
generators.override clang-linux.compile.c++.pch : pch.default-cpp-pch-generator ;
type.set-generated-target-suffix PCH
@@ -9,7 +9,7 @@
toolset.inherit-rules clang-linux : gcc ;
toolset.inherit-flags clang-linux : gcc
-@@ -96,24 +96,24 @@ rule compile.c++ ( targets * : sources *
+@@ -96,24 +96,24 @@ rule compile.c++ ( targets * : sources * : properties
gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
gcc.setup-address-model $(targets) : $(sources) : $(properties) ;
@@ -40,7 +40,7 @@
}
rule compile.c ( targets * : sources * : properties * )
-@@ -122,25 +122,25 @@ rule compile.c ( targets * : sources * :
+@@ -122,25 +122,25 @@ rule compile.c ( targets * : sources * : properties *
gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
gcc.setup-address-model $(targets) : $(sources) : $(properties) ;
@@ -72,21 +72,21 @@
}
###############################################################################
-@@ -153,7 +153,7 @@ rule compile.c++.pch ( targets * : sourc
+@@ -153,7 +153,7 @@ rule compile.c++.pch ( targets * : sources * : propert
}
actions compile.c++.pch {
-- rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pth -o "$(<)" "$(>)"
-+ rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pch -o "$(<)" "$(>)"
+- rm -f "$(<)" && "$(CONFIG_COMMAND)" -c -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pth -o "$(<)" "$(>)"
++ rm -f "$(<)" && "$(CONFIG_COMMAND)" -c -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pch -o "$(<)" "$(>)"
}
rule compile.c.pch ( targets * : sources * : properties * ) {
-@@ -164,7 +164,7 @@ rule compile.c.pch ( targets * : sources
+@@ -164,7 +164,7 @@ rule compile.c.pch ( targets * : sources * : propertie
actions compile.c.pch
{
-- rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pth -o "$(<)" "$(>)"
-+ rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pch -o "$(<)" "$(>)"
+- rm -f "$(<)" && "$(CONFIG_COMMAND)" -c -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pth -o "$(<)" "$(>)"
++ rm -f "$(<)" && "$(CONFIG_COMMAND)" -c -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pch -o "$(<)" "$(>)"
}
###############################################################################
diff --git a/devel/boost-libs/files/patch-tools_build_src_tools_gcc.jam b/devel/boost-libs/files/patch-tools_build_src_tools_gcc.jam
index 1c3345c6ad14..0d40125965dc 100644
--- a/devel/boost-libs/files/patch-tools_build_src_tools_gcc.jam
+++ b/devel/boost-libs/files/patch-tools_build_src_tools_gcc.jam
@@ -5,7 +5,7 @@ that USE_GCC already passes.
--- tools/build/src/tools/gcc.jam.orig 2016-09-21 14:33:28 UTC
+++ tools/build/src/tools/gcc.jam
-@@ -210,24 +210,6 @@ rule init ( version ? : command * : opti
+@@ -210,24 +210,6 @@ rule init ( version ? : command * : options * )
}
init-link-flags gcc $(linker) $(condition) ;