From: Jakub Bogusz Date: Sat, 12 Sep 2015 17:34:32 +0000 (+0200) Subject: - updated to 1.59.0 X-Git-Tag: auto/th/boost-1.59.0-2~1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=e3b7ac0916d003e25a4c987a8f9689f7fcfc1a68;p=packages%2Fboost.git - updated to 1.59.0 - updated clean-gcc-flags patch - removed obsolete spirit-unused_typedef,python-unused_typedef patches --- diff --git a/boost-1.54.0-python-unused_typedef.patch b/boost-1.54.0-python-unused_typedef.patch deleted file mode 100644 index 8adf8ed..0000000 --- a/boost-1.54.0-python-unused_typedef.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up boost_1_53_0/boost/python/to_python_value.hpp\~ boost_1_53_0/boost/python/to_python_value.hpp ---- boost_1_53_0/boost/python/to_python_value.hpp~ 2007-12-16 11:12:07.000000000 +0100 -+++ boost_1_53_0/boost/python/to_python_value.hpp 2013-07-23 16:19:02.518904596 +0200 -@@ -147,8 +147,8 @@ namespace detail - template - inline PyObject* registry_to_python_value::operator()(argument_type x) const - { -- typedef converter::registered r; - # if BOOST_WORKAROUND(__GNUC__, < 3) -+ typedef converter::registered r; - // suppresses an ICE, somehow - (void)r::converters; - # endif - -Diff finished. Tue Jul 23 16:19:05 2013 diff --git a/boost-1.54.0-spirit-unused_typedef.patch b/boost-1.54.0-spirit-unused_typedef.patch deleted file mode 100644 index 830e418..0000000 --- a/boost-1.54.0-spirit-unused_typedef.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up boost_1_54_0/boost/spirit/home/classic/core/primitives/primitives.hpp~ boost_1_54_0/boost/spirit/home/classic/core/primitives/primitives.hpp ---- boost_1_54_0/boost/spirit/home/classic/core/primitives/primitives.hpp~ 2008-06-22 08:05:38.000000000 -0700 -+++ boost_1_54_0/boost/spirit/home/classic/core/primitives/primitives.hpp 2013-07-22 06:35:38.417914083 -0700 -@@ -47,7 +47,6 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN - typename parser_result::type - parse(ScannerT const& scan) const - { -- typedef typename parser_result::type result_t; - typedef typename ScannerT::value_t value_t; - typedef typename ScannerT::iterator_t iterator_t; - diff --git a/boost-clean-gcc-flags.patch b/boost-clean-gcc-flags.patch index d0d52dc..592e7d7 100644 --- a/boost-clean-gcc-flags.patch +++ b/boost-clean-gcc-flags.patch @@ -1,6 +1,6 @@ ---- boost_1_58_0/tools/build/src/tools/gcc.jam~ 2015-06-07 11:33:34.000000000 +0200 -+++ boost_1_58_0/tools/build/src/tools/gcc.jam 2015-06-07 11:38:59.720016555 +0200 -@@ -366,9 +366,9 @@ +--- boost_1_59_0/tools/build/src/tools/gcc.jam.orig 2015-08-11 15:53:51.000000000 +0200 ++++ boost_1_59_0/tools/build/src/tools/gcc.jam 2015-09-12 17:16:00.647535444 +0200 +@@ -369,9 +369,9 @@ toolset.flags gcc.compile PCH_FILE on : ; # Declare flags and action for compilation. @@ -13,7 +13,7 @@ toolset.flags gcc.compile OPTIONS off : -fno-inline ; toolset.flags gcc.compile OPTIONS on : -Wno-inline ; -@@ -379,8 +379,8 @@ +@@ -382,8 +382,8 @@ toolset.flags gcc.compile OPTIONS all : -Wall -pedantic ; toolset.flags gcc.compile OPTIONS on : -Werror ; @@ -24,14 +24,14 @@ toolset.flags gcc.compile.c++ OPTIONS off : -fno-rtti ; toolset.flags gcc.compile.c++ OPTIONS off : -fno-exceptions ; -@@ -448,23 +448,6 @@ +@@ -451,23 +451,6 @@ option = -mlp64 ; } } - else - { - local arch = [ feature.get-values architecture : $(properties) ] ; -- if $(arch) != arm +- if $(arch) = power || $(arch) = sparc || $(arch) = x86 - { - if $(model) = 32 - { @@ -48,7 +48,7 @@ OPTIONS on $(targets) += $(option) ; } } -@@ -1073,7 +1056,7 @@ +@@ -1076,7 +1059,7 @@ # x86 and compatible # The 'native' option appeared in gcc 4.2 so we cannot safely use it as default. # Use i686 instead for 32-bit. diff --git a/boost.spec b/boost.spec index 7725b5d..c086132 100644 --- a/boost.spec +++ b/boost.spec @@ -11,12 +11,12 @@ Summary: The Boost C++ Libraries Summary(pl.UTF-8): Biblioteki C++ "Boost" Name: boost -Version: 1.58.0 -Release: 2 +Version: 1.59.0 +Release: 1 License: Boost Software License and others Group: Libraries Source0: http://downloads.sourceforge.net/boost/%{name}_%{fver}.tar.bz2 -# Source0-md5: b8839650e61e9c1c0a89f371dd475546 +# Source0-md5: 6aa9a5c6a4ca1016edd0ed1178e3cb87 Patch0: %{name}-link.patch Patch1: %{name}-x32-context.patch Patch2: %{name}-clean-gcc-flags.patch @@ -24,14 +24,11 @@ Patch2: %{name}-clean-gcc-flags.patch # https://svn.boost.org/trac/boost/ticket/5637 Patch203: %{name}-1.54.0-mpl-print.patch # https://svn.boost.org/trac/boost/ticket/8870 -Patch211: %{name}-1.54.0-spirit-unused_typedef.patch Patch212: %{name}-1.54.0-spirit-unused_typedef-2.patch # https://svn.boost.org/trac/boost/ticket/8878 Patch218: %{name}-1.54.0-locale-unused_typedef.patch # https://svn.boost.org/trac/boost/ticket/8881 Patch221: %{name}-1.54.0-mpi-unused_typedef.patch -# https://svn.boost.org/trac/boost/ticket/8888 -Patch222: %{name}-1.54.0-python-unused_typedef.patch URL: http://www.boost.org/ BuildRequires: bzip2-devel BuildRequires: expat-devel @@ -465,11 +462,9 @@ Dokumentacja dla biblioteki Boost C++. %patch2 -p1 %patch203 -p0 -%patch211 -p1 %patch212 -p1 %patch218 -p1 %patch221 -p1 -%patch222 -p1 cat << EOF > tools/build/src/user-config.jam using gcc : %{cxx_version} : %{__cxx} : "%{rpmcflags} -fPIC" "%{rpmcxxflags} -fPIC" "%{rpmldflags}" ;