configure.ac | 2 +-
solenv/gbuild/platform/com_GCC_defs.mk | 1 -
solenv/gbuild/platform/com_MSC_defs.mk | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 98623ff0cddb15af0086885e5bf3361da8106ff8
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Jan 22 20:11:15 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jan 23 11:14:35 2024 +0100
BOOST_ERROR_CODE_HEADER_ONLY doesn't do anything in boost >= 1.69
which was released on Dec 12th, 2018
https: //lists.boost.org/Archives/boost/2021/10/252209.php
Change-Id: I8d65d98648a44d7303fc46338bfdeba7801749e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162423
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 6136428fc689..33f64d0de3e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10573,7 +10573,7 @@ AC_MSG_CHECKING([which boost to use])
if test "$with_system_boost" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_BOOST=TRUE
- AX_BOOST_BASE([1.66],,[AC_MSG_ERROR([no suitable Boost found])])
+ AX_BOOST_BASE([1.69],,[AC_MSG_ERROR([no suitable Boost found])])
AX_BOOST_DATE_TIME
AX_BOOST_FILESYSTEM
AX_BOOST_IOSTREAMS
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index 3f50c4089b09..57338bc7f170 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -44,7 +44,6 @@ endif
gb_AFLAGS := $(AFLAGS)
gb_COMPILERDEFS := \
- -DBOOST_ERROR_CODE_HEADER_ONLY \
-DBOOST_SYSTEM_NO_DEPRECATED \
-DCPPU_ENV=$(CPPU_ENV) \
$(if $(filter EMSCRIPTEN,$(OS)),-U_FORTIFY_SOURCE) \
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index 2e7b2728de32..3bf1a9d0a041 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -49,7 +49,6 @@ endif
# like std::copy, std::transform (when MSVC_USE_DEBUG_RUNTIME is enabled)
gb_COMPILERDEFS := \
- -DBOOST_ERROR_CODE_HEADER_ONLY \
-DBOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE \
-DBOOST_SYSTEM_NO_DEPRECATED \
-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING \
