[Libreoffice-commits] core.git: download.lst external/boost external/libcmis filter/Library_svgfilter.mk sdext/Library_pdfimport.mk solenv/gbuild
Michael Stahl
mstahl at redhat.com
Mon Jan 22 08:33:00 UTC 2018
download.lst | 4 +-
external/boost/UnpackedTarball_boost.mk | 2 -
external/boost/boost.auto_link.patch | 46 ---------------------------
external/boost/clang-cl.patch.0 | 50 ------------------------------
external/libcmis/StaticLibrary_libcmis.mk | 4 ++
filter/Library_svgfilter.mk | 1
sdext/Library_pdfimport.mk | 1
solenv/gbuild/platform/com_GCC_defs.mk | 5 +++
8 files changed, 13 insertions(+), 100 deletions(-)
New commits:
commit 41abd684a6d1f3da71084fd854f66e22cb171b9d
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jan 19 12:31:06 2018 +0100
boost: upgrade to release 1.66.0
This claims to support Visual Studio 2017.4, but not the current
2017.5.
* remove boost.auto_link.patch; it does not apply; not sure why we
need this if we can just define BOOST_ALL_NO_LIB
(see commit 7f2e168421c3cd928a31a52a8b5afe97e931d3ba)
* remove some hunks from clang-cl.patch.0 that look fixed upstream
* add a global workaround for spurious GCC warning:
oox/source/drawingml/shape.cxx:921:54: error:
‘oShadowColor.boost::optional_detail::tc_optional_base<int>::m_storage’
may be used uninitialized in this function
[-Werror=maybe-uninitialized]
aFormat.Color = *oShadowColor;
Change-Id: I1eb1d8b66554a84a7d7269f1faaa98695fe2f501
Reviewed-on: https://gerrit.libreoffice.org/48187
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/download.lst b/download.lst
index ae825299d6cf..f932b7a3b242 100644
--- a/download.lst
+++ b/download.lst
@@ -6,8 +6,8 @@ export APR_SHA256SUM := 1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c7
export APR_TARBALL := apr-1.5.2.tar.gz
export APR_UTIL_SHA256SUM := 976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19
export APR_UTIL_TARBALL := apr-util-1.5.4.tar.gz
-export BOOST_SHA256SUM := 9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81
-export BOOST_TARBALL := boost_1_65_1.tar.bz2
+export BOOST_SHA256SUM := 5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9
+export BOOST_TARBALL := boost_1_66_0.tar.bz2
export BREAKPAD_SHA256SUM := 7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9
export BREAKPAD_TARBALL := breakpad.zip
export BSH_SHA256SUM := 9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 44ee759141e5..21136ed2aec0 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -20,8 +20,6 @@ boost_patches += boost.multi_array.C4510.warnings.patch
# https://svn.boost.org/trac/boost/ticket/9903
boost_patches += boost.utility.Wundef.warnings.patch
-boost_patches += boost.auto_link.patch
-
boost_patches += boost.noiconv.patch
boost_patches += ubsan.patch.0
diff --git a/external/boost/boost.auto_link.patch b/external/boost/boost.auto_link.patch
deleted file mode 100644
index ed60dec66e8d..000000000000
--- a/external/boost/boost.auto_link.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ru boost.orig/boost/config/auto_link.hpp boost/boost/config/auto_link.hpp
---- foo/misc/boost.orig/boost/config/auto_link.hpp 2015-05-07 19:11:52.000000000 +0200
-+++ foo/misc/boost/boost/config/auto_link.hpp 2015-07-18 22:34:14.371946475 +0200
-@@ -367,42 +367,6 @@
- # define BOOST_LIB_PREFIX "lib"
- #endif
-
--//
--// now include the lib:
--//
--#if defined(BOOST_LIB_NAME) \
-- && defined(BOOST_LIB_PREFIX) \
-- && defined(BOOST_LIB_TOOLSET) \
-- && defined(BOOST_LIB_THREAD_OPT) \
-- && defined(BOOST_LIB_RT_OPT) \
-- && defined(BOOST_LIB_VERSION)
--
--#ifdef BOOST_AUTO_LINK_TAGGED
--# pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib")
--# ifdef BOOST_LIB_DIAGNOSTIC
--# pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib")
--# endif
--#elif defined(BOOST_AUTO_LINK_NOMANGLE)
--# pragma comment(lib, BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib")
--# ifdef BOOST_LIB_DIAGNOSTIC
--# pragma message ("Linking to lib file: " BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib")
--# endif
--#elif defined(BOOST_LIB_BUILDID)
--# pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION "-" BOOST_STRINGIZE(BOOST_LIB_BUILDID) ".lib")
--# ifdef BOOST_LIB_DIAGNOSTIC
--# pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION "-" BOOST_STRINGIZE(BOOST_LIB_BUILDID) ".lib")
--# endif
--#else
--# pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib")
--# ifdef BOOST_LIB_DIAGNOSTIC
--# pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib")
--# endif
--#endif
--
--#else
--# error "some required macros where not defined (internal logic error)."
--#endif
--
-
- #endif // _MSC_VER || __BORLANDC__
-
diff --git a/external/boost/clang-cl.patch.0 b/external/boost/clang-cl.patch.0
index 6d07df7983fa..3990f27eb3f5 100644
--- a/external/boost/clang-cl.patch.0
+++ b/external/boost/clang-cl.patch.0
@@ -1,42 +1,3 @@
---- boost/date_time/filetime_functions.hpp
-+++ boost/date_time/filetime_functions.hpp
-@@ -27,6 +27,16 @@
- #include <boost/date_time/time.hpp>
- #include <boost/date_time/date_defs.hpp>
-
-+#if !defined(BOOST_USE_WINDOWS_H)
-+extern "C" {
-+ struct _FILETIME; // Windows Kits/8.1/Include/shared/minwindef.h
-+ struct _SYSTEMTIME; // Windows Kits/8.1/Include/um/minwinbase.h
-+ __declspec(dllimport) void __stdcall GetSystemTimeAsFileTime(_FILETIME* lpFileTime);
-+ __declspec(dllimport) int __stdcall FileTimeToLocalFileTime(const _FILETIME* lpFileTime, _FILETIME* lpLocalFileTime);
-+ __declspec(dllimport) void __stdcall GetSystemTime(_SYSTEMTIME* lpSystemTime);
-+ __declspec(dllimport) int __stdcall SystemTimeToFileTime(const _SYSTEMTIME* lpSystemTime, _FILETIME* lpFileTime);
-+}
-+#endif
- namespace boost {
-
- namespace date_time {
-@@ -54,10 +64,6 @@
- boost::uint16_t wMilliseconds;
- };
-
-- __declspec(dllimport) void __stdcall GetSystemTimeAsFileTime(FILETIME* lpFileTime);
-- __declspec(dllimport) int __stdcall FileTimeToLocalFileTime(const FILETIME* lpFileTime, FILETIME* lpLocalFileTime);
-- __declspec(dllimport) void __stdcall GetSystemTime(SYSTEMTIME* lpSystemTime);
-- __declspec(dllimport) int __stdcall SystemTimeToFileTime(const SYSTEMTIME* lpSystemTime, FILETIME* lpFileTime);
-
- } // extern "C"
-
-@@ -74,7 +80,7 @@
- GetSystemTimeAsFileTime(&ft_utc);
- FileTimeToLocalFileTime(&ft_utc, &ft);
- #elif defined(BOOST_HAS_GETSYSTEMTIMEASFILETIME)
-- GetSystemTimeAsFileTime(&ft);
-+ GetSystemTimeAsFileTime(reinterpret_cast<::_FILETIME *>(&ft));
- #else
- system_time st;
- GetSystemTime(&st);
--- boost/multi_array/base.hpp
+++ boost/multi_array/base.hpp
@@ -222,7 +222,7 @@
@@ -57,17 +18,6 @@
// Deal with VC 2010 output_iterator_tag requirement
typedef array_iterator<T,T*,mpl::size_t<NumDims>,reference,
mutable_iterator_tag> iterator;
---- boost/multi_array/iterator.hpp
-+++ boost/multi_array/iterator.hpp
-@@ -60,7 +60,7 @@
- , private
- value_accessor_generator<T,NumDims>::type
- {
-- friend class iterator_core_access;
-+ friend class boost::iterators::iterator_core_access;
- typedef detail::multi_array::associated_types<T,NumDims> access_t;
-
- typedef iterator_facade<
# workdir/UnpackedTarball/boost\boost/smart_ptr/detail/yield_k.hpp(63,29) : error: 'Sleep' redeclared without 'dllimport' attribute: previous 'dll# import' ignored [-Werror,-Winconsistent-dllimport]
# extern "C" void __stdcall Sleep( unsigned long ms );
diff --git a/external/libcmis/StaticLibrary_libcmis.mk b/external/libcmis/StaticLibrary_libcmis.mk
index 39b9545d5345..652ece120a35 100644
--- a/external/libcmis/StaticLibrary_libcmis.mk
+++ b/external/libcmis/StaticLibrary_libcmis.mk
@@ -34,6 +34,10 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,libcmis, \
))
endif
+$(eval $(call gb_StaticLibrary_add_defs,libcmis, \
+ -DBOOST_ALL_NO_LIB \
+))
+
$(eval $(call gb_StaticLibrary_set_include,libcmis, \
-I$(call gb_UnpackedTarball_get_dir,libcmis/src/libcmis) \
$$(INCLUDE) \
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index 2638d586129f..b8e52c73d9fe 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Library_use_custom_headers,svgfilter,filter/source/svg))
$(eval $(call gb_Library_set_componentfile,svgfilter,filter/source/svg/svgfilter))
$(eval $(call gb_Library_add_defs,svgfilter,\
+ -DBOOST_ALL_NO_LIB \
-DUSE_MODERN_SPIRIT \
-DFILTER_DLLIMPLEMENTATION \
))
diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index d181ae15682a..854f00c49248 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_externals,pdfimport,\
$(eval $(call gb_Library_add_defs,pdfimport, \
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+ -DBOOST_ALL_NO_LIB \
))
$(eval $(call gb_Library_add_exception_objects,pdfimport,\
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index e1082c952528..68de52a41593 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -98,6 +98,11 @@ endif
ifeq ($(COM_IS_CLANG),TRUE)
gb_CXXFLAGS_COMMON += -Wimplicit-fallthrough
+else
+# GCC 4.8, at least, is confused by boost 1.66 optional assignments
+ifeq ($(shell expr '$(GCC_VERSION)' '<' 490),1)
+gb_CXXFLAGS_COMMON += -Wno-maybe-uninitialized
+endif
endif
More information about the Libreoffice-commits
mailing list