RepositoryModule_host.mk | 33 ++---- boost/boost_1_44_0-gcc4.8.patch | 209 ++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 3 files changed, 222 insertions(+), 22 deletions(-)
New commits: commit 789c46b931672aabf79cc3b3823bdfc8736bdc8f Author: Michael Stahl <[email protected]> Date: Fri May 31 14:08:02 2013 +0200 boost: patch various -Werror=unused-local-typedefs Change-Id: Ibf37c17c741fb1844ec9e301a3cc63a3bb3f48de diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch index f5bb0da..891f70c 100644 --- a/boost/boost_1_44_0-gcc4.8.patch +++ b/boost/boost_1_44_0-gcc4.8.patch @@ -1,3 +1,212 @@ + + +--- a/b/boost/boost/math/special_functions/gamma.hpp 2013-05-31 18:09:38.509792503 +0200 ++++ a/b/boost/boost/math/special_functions/gamma.hpp 2013-05-31 18:09:41.438795355 +0200 +@@ -1360,7 +1360,6 @@ + BOOST_FPU_EXCEPTION_GUARD + typedef typename tools::promote_args<T1, T2>::type result_type; + typedef typename policies::evaluation<result_type, Policy>::type value_type; +- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type; + typedef typename policies::normalise< + Policy, + policies::promote_float<false>, +@@ -1489,7 +1488,6 @@ + BOOST_FPU_EXCEPTION_GUARD + typedef typename tools::promote_args<T1, T2>::type result_type; + typedef typename policies::evaluation<result_type, Policy>::type value_type; +- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type; + typedef typename policies::normalise< + Policy, + policies::promote_float<false>, +@@ -1520,7 +1518,6 @@ + BOOST_FPU_EXCEPTION_GUARD + typedef typename tools::promote_args<T1, T2>::type result_type; + typedef typename policies::evaluation<result_type, Policy>::type value_type; +- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type; + typedef typename policies::normalise< + Policy, + policies::promote_float<false>, +@@ -1551,7 +1548,6 @@ + BOOST_FPU_EXCEPTION_GUARD + typedef typename tools::promote_args<T1, T2>::type result_type; + typedef typename policies::evaluation<result_type, Policy>::type value_type; +- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type; + typedef typename policies::normalise< + Policy, + policies::promote_float<false>, +--- a/b/boost/boost/math/special_functions/detail/igamma_inverse.hpp 2013-05-31 18:11:23.420936359 +0200 ++++ a/b/boost/boost/math/special_functions/detail/igamma_inverse.hpp 2013-05-31 18:11:24.772938706 +0200 +@@ -341,7 +341,6 @@ + // flag is set, then Q(x) - q and it's derivatives. + // + typedef typename policies::evaluation<T, Policy>::type value_type; +- typedef typename lanczos::lanczos<T, Policy>::type evaluation_type; + typedef typename policies::normalise< + Policy, + policies::promote_float<false>, +--- a/b/boost/boost/math/special_functions/beta.hpp 2013-05-31 18:12:02.036007347 +0200 ++++ a/b/boost/boost/math/special_functions/beta.hpp 2013-05-31 18:11:56.260996218 +0200 +@@ -1331,7 +1331,6 @@ + BOOST_FPU_EXCEPTION_GUARD + typedef typename tools::promote_args<RT1, RT2, RT3>::type result_type; + typedef typename policies::evaluation<result_type, Policy>::type value_type; +- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type; + typedef typename policies::normalise< + Policy, + policies::promote_float<false>, +@@ -1349,7 +1348,6 @@ + BOOST_FPU_EXCEPTION_GUARD + typedef typename tools::promote_args<RT1, RT2, RT3>::type result_type; + typedef typename policies::evaluation<result_type, Policy>::type value_type; +- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type; + typedef typename policies::normalise< + Policy, + policies::promote_float<false>, +--- a/b/boost/boost/random/generate_canonical.hpp 2013-05-31 18:13:09.804149686 +0200 ++++ a/b/boost/boost/random/generate_canonical.hpp 2013-05-31 18:13:30.020195845 +0200 +@@ -55,7 +55,6 @@ + using std::floor; + BOOST_ASSERT((g.min)() == 0); + BOOST_ASSERT((g.max)() == 1); +- typedef typename URNG::result_type base_result; + std::size_t digits = std::numeric_limits<RealType>::digits; + std::size_t engine_bits = detail::generator_bits<URNG>::value(); + std::size_t b = (std::min)(bits, digits); +--- a/b/boost/boost/random/uniform_real_distribution.hpp 2013-05-31 18:15:04.571429634 +0200 ++++ a/b/boost/boost/random/uniform_real_distribution.hpp 2013-05-31 18:14:28.452337186 +0200 +@@ -36,7 +36,6 @@ + { + for(;;) { + typedef T result_type; +- typedef typename Engine::result_type base_result; + result_type numerator = static_cast<T>(eng() - (eng.min)()); + result_type divisor = static_cast<T>((eng.max)() - (eng.min)()); + BOOST_ASSERT(divisor > 0); +--- a/b/boost/boost/lexical_cast.hpp 2013-05-31 13:52:39.758500819 +0200 ++++ a/b/boost/boost/lexical_cast.hpp 2013-05-31 13:52:43.927514850 +0200 +@@ -865,7 +865,6 @@ + #ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS + BOOST_STATIC_ASSERT(!std::numeric_limits<T>::is_signed); + #endif +- typedef typename Traits::int_type int_type; + CharT const czero = lcast_char_constants<CharT>::zero; + --end; + value = 0; +--- a/b/boost/boost/math/special_functions/sign.hpp 2013-05-31 13:53:52.518746080 +0200 ++++ a/b/boost/boost/math/special_functions/sign.hpp 2013-05-31 13:59:08.053810037 +0200 +@@ -110,7 +110,6 @@ + { + typedef typename detail::fp_traits<T>::type traits; + typedef typename traits::method method; +- typedef typename boost::is_floating_point<T>::type fp_tag; + return detail::signbit_impl(x, method()); + } + +@@ -124,7 +123,6 @@ + { //!< \brief return unchanged binary pattern of x, except for change of sign bit. + typedef typename detail::fp_traits<T>::sign_change_type traits; + typedef typename traits::method method; +- typedef typename boost::is_floating_point<T>::type fp_tag; + + return detail::changesign_impl(x, method()); + } +--- a/b/boost/boost/math/special_functions/fpclassify.hpp 2013-05-31 14:02:13.660436127 +0200 ++++ a/b/boost/boost/math/special_functions/fpclassify.hpp 2013-05-31 14:01:17.372246240 +0200 +@@ -328,7 +328,6 @@ + { //!< \brief return true if floating-point type t is finite. + typedef typename detail::fp_traits<T>::type traits; + typedef typename traits::method method; +- typedef typename boost::is_floating_point<T>::type fp_tag; + typedef typename tools::promote_args<T>::type value_type; + return detail::isfinite_impl(static_cast<value_type>(x), method()); + } +@@ -339,7 +338,6 @@ + { //!< \brief return true if floating-point type t is finite. + typedef detail::fp_traits<long double>::type traits; + typedef traits::method method; +- typedef boost::is_floating_point<long double>::type fp_tag; + typedef long double value_type; + return detail::isfinite_impl(static_cast<value_type>(x), method()); + } +@@ -399,7 +397,6 @@ + { + typedef typename detail::fp_traits<T>::type traits; + typedef typename traits::method method; +- typedef typename boost::is_floating_point<T>::type fp_tag; + typedef typename tools::promote_args<T>::type value_type; + return detail::isnormal_impl(static_cast<value_type>(x), method()); + } +@@ -410,7 +407,6 @@ + { + typedef detail::fp_traits<long double>::type traits; + typedef traits::method method; +- typedef boost::is_floating_point<long double>::type fp_tag; + typedef long double value_type; + return detail::isnormal_impl(static_cast<value_type>(x), method()); + } +@@ -488,7 +484,6 @@ + { + typedef typename detail::fp_traits<T>::type traits; + typedef typename traits::method method; +- typedef typename boost::is_floating_point<T>::type fp_tag; + typedef typename tools::promote_args<T>::type value_type; + return detail::isinf_impl(static_cast<value_type>(x), method()); + } +@@ -499,7 +494,6 @@ + { + typedef detail::fp_traits<long double>::type traits; + typedef traits::method method; +- typedef boost::is_floating_point<long double>::type fp_tag; + typedef long double value_type; + return detail::isinf_impl(static_cast<value_type>(x), method()); + } +@@ -571,7 +565,6 @@ + { //!< \brief return true if floating-point type t is NaN (Not A Number). + typedef typename detail::fp_traits<T>::type traits; + typedef typename traits::method method; +- typedef typename boost::is_floating_point<T>::type fp_tag; + return detail::isnan_impl(x, method()); + } + +@@ -585,7 +578,6 @@ + { //!< \brief return true if floating-point type t is NaN (Not A Number). + typedef detail::fp_traits<long double>::type traits; + typedef traits::method method; +- typedef boost::is_floating_point<long double>::type fp_tag; + return detail::isnan_impl(x, method()); + } + #endif +--- a/b/boost/boost/date_time/gregorian/greg_facet.hpp 2013-05-31 14:03:30.476695310 +0200 ++++ a/b/boost/boost/date_time/gregorian/greg_facet.hpp 2013-05-31 14:03:22.894669713 +0200 +@@ -215,7 +215,6 @@ + { + std::istream_iterator<std::basic_string<charT>, charT> beg(is), eos; + +- typedef boost::date_time::all_date_names_put<greg_facet_config, charT> facet_def; + d = from_stream(beg, eos); + return is; + } +--- a/b/boost/boost/unordered/detail/unique.hpp 2013-05-31 13:32:51.122254361 +0200 ++++ a/b/boost/boost/unordered/detail/unique.hpp 2013-05-31 13:32:57.578278121 +0200 +@@ -334,8 +334,6 @@ + + value_type& operator[](key_type const& k) + { +- typedef typename value_type::second_type mapped_type; +- + std::size_t key_hash = this->hash(k); + iterator pos = this->find_node(key_hash, k); + +--- a/b/boost/boost/tuple/detail/tuple_basic.hpp 2013-05-31 13:31:21.682966336 +0200 ++++ a/b/boost/boost/tuple/detail/tuple_basic.hpp 2013-05-31 13:32:44.067231648 +0200 +@@ -225,7 +225,6 @@ + get(const cons<HT, TT>& c BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) { + typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE + apply<cons<HT, TT> > impl; +- typedef BOOST_DEDUCED_TYPENAME impl::type cons_element; + return impl::call(c).head; + } + --- misc/boost_1_44_0/boost/algorithm/string/detail/finder.hpp +++ misc/build/boost_1_44_0/boost/algorithm/string/detail/finder.hpp @@ -142,7 +142,6 @@ commit 18b0bda1be62da1b0f9c1fc40864ccc486d5b43c Author: Michael Stahl <[email protected]> Date: Fri May 31 15:24:34 2013 +0200 configure: use -isystem for GSTREAMER_CFLAGS ... to work around GCC 4.8.0 -Werror=literal-suffix in gst/video/video.h definition of GST_VIDEO_CAPS_RGB8_PALETTED. Change-Id: I514b29d58f348bad0b13c7ef66db4b3ee34516cd diff --git a/configure.ac b/configure.ac index aee6047..af3100c 100644 --- a/configure.ac +++ b/configure.ac @@ -9499,6 +9499,7 @@ if test "$build_gstreamer" = "yes"; then ENABLE_GSTREAMER="TRUE" AC_MSG_RESULT([yes]) PKG_CHECK_MODULES( GSTREAMER, gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-video-1.0 ) + GSTREAMER_CFLAGS="`echo $GSTREAMER_CFLAGS | sed -e \"s/-I/${ISYSTEM}/g\"`" else AC_MSG_RESULT([no]) fi @@ -9518,6 +9519,7 @@ if test "$build_gstreamer_0_10" = "yes"; then PKG_CHECK_MODULES( [GSTREAMER_0_10], [gstreamer-0.10 gstreamer-plugins-base-0.10 gstreamer-interfaces-0.10],, [ PKG_CHECK_MODULES( [GSTREAMER_0_10], [gstreamer-0.10 gstreamer-plugins-base-0.10] ) ]) + GSTREAMER_0_10_CFLAGS="`echo $GSTREAMER_0_10_CFLAGS | sed -e \"s/-I/${ISYSTEM}/g\"`" else AC_MSG_RESULT([no]) fi commit c70e55c5d8ecfd5bb690886d7e39a42f66b3702a Author: Michael Stahl <[email protected]> Date: Fri May 31 23:09:20 2013 +0200 RepositoryModule: add the libraries back from the reverted commit ... but this time hopefully topologically sorted. Change-Id: I94960795d729d803641fe7bbf47797f733b56c40 diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 259ca29..b9e64f2 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -241,6 +241,8 @@ $(if $(strip $(1)),\ $(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1)))) endef +# DO NOT SORT ALPHABETICALLY: the libraries must be listed in dependency order, +# otherwise cyclic dependencies ruin everything. # do not serialize on a partial build as that may fail due to missing deps. # the default goal is all (see Module.mk) ifeq (,$(filter-out all,$(MAKECMDGOALS))) @@ -249,9 +251,9 @@ $(eval $(call repositorymodule_serialize,\ $(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \ sc msword swui sw sd \ $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \ - writerfilter cui chartcontroller oox \ + writerfilter cui chartcontroller chartcore oox svx \ $(if $(MERGELIBS),merged,svxcore) \ - xo vcl \ + xo sfx fwk svt vcl \ )) endif commit c4f7ed869fec153b92bee00b191b5504efdd09d7 Author: Michael Stahl <[email protected]> Date: Fri May 31 23:02:33 2013 +0200 RepositoryModule: un-break serialization of libraries The serialization was effectively disabled because the top-level Makefile does not invoke Makefile.gbuild with "all" target but with empty (default) target so MAKECMDS is empty. (regression from 96409470b19d32a2310086b089542b333686f4da) Change-Id: I919c6543a282945cbb36468ff0d4666718a7d8f6 diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 93a2fe7..259ca29 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -241,7 +241,9 @@ $(if $(strip $(1)),\ $(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1)))) endef -ifeq (all,$(filter all,$(MAKECMDGOALS))) +# do not serialize on a partial build as that may fail due to missing deps. +# the default goal is all (see Module.mk) +ifeq (,$(filter-out all,$(MAKECMDGOALS))) $(eval $(call repositorymodule_serialize,\ scfilt \ $(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \ commit fcca05c337bb0e4ffc2df88b4da4559f42598295 Author: Michael Stahl <[email protected]> Date: Fri May 31 22:51:40 2013 +0200 Revert "update the list of serialized libs" This reverts commit fd3a23ce33bdec454273ba2bb3ea307b8420bcc0. The list of serialized libraries must be sorted in dependency order, otherwise there will be cyclic dependencies. diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 6f16d13..93a2fe7 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -241,30 +241,15 @@ $(if $(strip $(1)),\ $(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1)))) endef -# this list consists of libraries above the arbitrary cut-off of 30M -# on a --enable-debug linux build ifeq (all,$(filter all,$(MAKECMDGOALS))) $(eval $(call repositorymodule_serialize,\ - chartcore \ - chartcontroller \ - cui \ - $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ - fwk \ - $(if $(MERGELIBS),merged) \ - msword \ - oox \ - sc \ scfilt \ - sd \ - sfx \ - svt \ - svx \ - svxcore \ - sw \ - swui \ - vcl \ - writerfilter \ - xo \ + $(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \ + sc msword swui sw sd \ + $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \ + writerfilter cui chartcontroller oox \ + $(if $(MERGELIBS),merged,svxcore) \ + xo vcl \ )) endif _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
