external/boost/UnpackedTarball_boost.mk | 2 ++ external/boost/Wundef.patch.0 | 11 +++++++++++ 2 files changed, 13 insertions(+)
New commits: commit e69c7cc46ef5a100d9581b7efb01ab4a868d1924 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Tue Jan 15 09:09:44 2019 +0100 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Tue Jan 15 11:06:07 2019 +0100 Avoid -Werror=undef in boost/optional.hpp ...after 23a8d5ffbbe58761b89f590f0735abccd69a3681 "Upgrade external/boost to Boost 1.69.0", where at least some GCC versions apparently choke on -Wundef there even though going through external/boost/include/boost/optional.hpp with #pragma GCC diagnostic ignored "-Wundef" (<https://ci.libreoffice.org/job/lo_tb_master_linux_dbg/23929/>): > In file included from /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/workdir/UnpackedTarball/boost/boost/core/explicit_operator_bool.hpp:22:0, > from /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/workdir/UnpackedTarball/boost/boost/optional/optional.hpp:30, > from /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/external/boost/include/boost/optional/optional.hpp:27, > from /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/workdir/UnpackedTarball/boost/boost/optional.hpp:15, > from /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/external/boost/include/boost/optional.hpp:27, > from /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/include/vcl/outdevstate.hxx:31, > from /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/include/vcl/outdev.hxx:39, > from /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/include/vcl/window.hxx:25, > from /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/include/vcl/ctrl.hxx:25, > from /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/include/vcl/fixed.hxx:25, > from /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/comphelper/source/misc/xmlsechelper.cxx:25: > /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/workdir/UnpackedTarball/boost/boost/type_traits/detail/config.hpp:85:69: error: "__clang_major___WORKAROUND_GUARD" is not defined, evaluates to 0 [-Werror=undef] > && !BOOST_WORKAROUND(BOOST_MSVC, < 1900) && !BOOST_WORKAROUND(__clang_major__, <= 4) > ^ > /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/workdir/UnpackedTarball/boost/boost/config/workaround.hpp:253:10: note: in definition of macro ‘BOOST_WORKAROUND’ > ((symbol ## _WORKAROUND_GUARD + 0 == 0) && \ > ^~~~~~ > /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/workdir/UnpackedTarball/boost/boost/type_traits/detail/config.hpp:85:69: error: "__clang_major__" is not defined, evaluates to 0 [-Werror=undef] > && !BOOST_WORKAROUND(BOOST_MSVC, < 1900) && !BOOST_WORKAROUND(__clang_major__, <= 4) > ^ > /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/workdir/UnpackedTarball/boost/boost/config/workaround.hpp:254:9: note: in definition of macro ‘BOOST_WORKAROUND’ > (symbol != 0) && (1 % (( (symbol test) ) + 1))) > ^~~~~~ Change-Id: I9fe6bf0019fcddad7e1b5606a162474130a9250e Reviewed-on: https://gerrit.libreoffice.org/66349 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index 86f52ded439e..f20bd08d8c15 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -40,6 +40,8 @@ boost_patches += msvc2017.patch.0 boost_patches += sse.patch.0 +boost_patches += Wundef.patch.0 + $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL))) diff --git a/external/boost/Wundef.patch.0 b/external/boost/Wundef.patch.0 new file mode 100644 index 000000000000..aa2d383435d0 --- /dev/null +++ b/external/boost/Wundef.patch.0 @@ -0,0 +1,11 @@ +--- boost/type_traits/detail/config.hpp ++++ boost/type_traits/detail/config.hpp +@@ -82,7 +82,7 @@ + // Can we implement accurate is_function/is_member_function_pointer (post C++03)? + // + #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !BOOST_WORKAROUND(BOOST_GCC, < 40900)\ +- && !BOOST_WORKAROUND(BOOST_MSVC, < 1900) && !BOOST_WORKAROUND(__clang_major__, <= 4) ++ && !BOOST_WORKAROUND(BOOST_MSVC, < 1900) && !(defined __clang_major__ && BOOST_WORKAROUND(__clang_major__, <= 4)) + # define BOOST_TT_HAS_ASCCURATE_IS_FUNCTION + #endif + _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits