Initial packaging of Beta 1.53.0
- this fails at the end of the build complaining that the following file wasn't found: boost-1.53.0-0.1.beta1.fc18.i386/usr/lib/openmpi/lib/*.a
This commit is contained in:
parent
ba25f6b6bb
commit
a84f7fd048
@ -1,11 +0,0 @@
|
||||
--- /usr/include/boost/polygon/polygon.hpp.orig 2012-01-26 01:05:15.934998805 +0800
|
||||
+++ /usr/include/boost/polygon/polygon.hpp 2012-01-26 01:13:10.547000000 +0800
|
||||
@@ -24,6 +24,8 @@
|
||||
#include "transform.hpp"
|
||||
#include "detail/transform_detail.hpp"
|
||||
|
||||
+#include "detail/polygon_sort_adaptor.hpp"
|
||||
+
|
||||
//interval
|
||||
#include "interval_data.hpp"
|
||||
#include "interval_traits.hpp"
|
@ -1,23 +0,0 @@
|
||||
diff -up /home/petr/tmp/blefuj.cc\~ /home/petr/tmp/blefuj.cc
|
||||
--- boost_1_46_0_beta1/libs/signals/src/named_slot_map.cpp~ 2011-02-03 20:28:07.000000000 +0100
|
||||
+++ boost_1_46_0_beta1/libs/signals/src/named_slot_map.cpp 2011-02-03 20:51:29.000000000 +0100
|
||||
@@ -47669,7 +47669,7 @@ void named_slot_map::disconnect(const st
|
||||
i->first.disconnect();
|
||||
i = next;
|
||||
}
|
||||
- groups.erase(group);
|
||||
+ groups.erase(const_group_iterator (group));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47692,7 +47692,7 @@ void named_slot_map::remove_disconnected
|
||||
}
|
||||
|
||||
// Clear out empty groups
|
||||
- if (empty(g)) groups.erase(g++);
|
||||
+ if (empty(g)) groups.erase(const_group_iterator (g++));
|
||||
else ++g;
|
||||
}
|
||||
}
|
||||
|
||||
Diff finished. Thu Feb 3 20:51:41 2011
|
@ -1,24 +1,3 @@
|
||||
diff -urp boost_1_48_0~/boost/asio/buffers_iterator.hpp boost_1_48_0/boost/asio/buffers_iterator.hpp
|
||||
--- boost_1_48_0~/boost/asio/buffers_iterator.hpp 2012-01-16 16:15:26.550239797 +0100
|
||||
+++ boost_1_48_0/boost/asio/buffers_iterator.hpp 2012-01-16 16:17:45.880243120 +0100
|
||||
@@ -128,7 +128,7 @@ public:
|
||||
/// Construct an iterator representing the beginning of the buffers' data.
|
||||
static buffers_iterator begin(const BufferSequence& buffers)
|
||||
#if BOOST_WORKAROUND(__GNUC__, == 4) && BOOST_WORKAROUND(__GNUC_MINOR__, == 3)
|
||||
- __attribute__ ((noinline))
|
||||
+ __attribute__ ((__noinline__))
|
||||
#endif
|
||||
{
|
||||
buffers_iterator new_iter;
|
||||
@@ -148,7 +148,7 @@ public:
|
||||
/// Construct an iterator representing the end of the buffers' data.
|
||||
static buffers_iterator end(const BufferSequence& buffers)
|
||||
#if BOOST_WORKAROUND(__GNUC__, == 4) && BOOST_WORKAROUND(__GNUC_MINOR__, == 3)
|
||||
- __attribute__ ((noinline))
|
||||
+ __attribute__ ((__noinline__))
|
||||
#endif
|
||||
{
|
||||
buffers_iterator new_iter;
|
||||
diff -urp boost_1_48_0~/boost/config/compiler/gcc.hpp boost_1_48_0/boost/config/compiler/gcc.hpp
|
||||
--- boost_1_48_0~/boost/config/compiler/gcc.hpp 2012-01-16 16:15:14.643239525 +0100
|
||||
+++ boost_1_48_0/boost/config/compiler/gcc.hpp 2012-01-16 16:21:24.072247987 +0100
|
||||
@ -76,15 +55,3 @@ diff -urp boost_1_48_0~/boost/random/detail/integer_log2.hpp boost_1_48_0/boost/
|
||||
#else
|
||||
#define BOOST_RANDOM_DETAIL_CONSTEXPR inline
|
||||
#endif
|
||||
diff -urp boost_1_48_0~/boost/xpressive/detail/core/adaptor.hpp boost_1_48_0/boost/xpressive/detail/core/adaptor.hpp
|
||||
--- boost_1_48_0~/boost/xpressive/detail/core/adaptor.hpp 2012-01-16 16:15:32.315239932 +0100
|
||||
+++ boost_1_48_0/boost/xpressive/detail/core/adaptor.hpp 2012-01-16 16:17:54.024243179 +0100
|
||||
@@ -41,7 +41,7 @@ struct xpression_adaptor
|
||||
&& ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
|
||||
// Ugh, gcc has an optimizer bug which elides this c'tor call
|
||||
// resulting in pure virtual function calls.
|
||||
- __attribute__((noinline))
|
||||
+ __attribute__((__noinline__))
|
||||
#endif
|
||||
: xpr_(xpr)
|
||||
{
|
26
boost.spec
26
boost.spec
@ -23,9 +23,9 @@
|
||||
|
||||
Name: boost
|
||||
Summary: The free peer-reviewed portable C++ source libraries
|
||||
Version: 1.50.0
|
||||
%define version_enc 1_50_0
|
||||
Release: 7%{?dist}
|
||||
Version: 1.53.0
|
||||
%define version_enc 1_53_0_beta1
|
||||
Release: 0.1.beta1%{?dist}
|
||||
License: Boost and MIT and Python
|
||||
|
||||
%define toplev_dirname %{name}_%{version_enc}
|
||||
@ -72,10 +72,6 @@ BuildRequires: python3-devel%{?_isa}
|
||||
BuildRequires: libicu-devel%{?_isa}
|
||||
BuildRequires: chrpath
|
||||
|
||||
# The patch may break c++03, and there is therefore no plan yet to include
|
||||
# it upstream: https://svn.boost.org/trac/boost/ticket/4999
|
||||
Patch2: boost-1.50.0-signals-erase.patch
|
||||
|
||||
# https://svn.boost.org/trac/boost/ticket/6150
|
||||
Patch4: boost-1.50.0-fix-non-utf8-files.patch
|
||||
|
||||
@ -90,21 +86,15 @@ Patch7: boost-1.50.0-foreach.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=781859
|
||||
# The following tickets have still to be fixed by upstream.
|
||||
# https://svn.boost.org/trac/boost/ticket/6406 fixed, but only in Boost-1.51.0
|
||||
# https://svn.boost.org/trac/boost/ticket/6408
|
||||
# https://svn.boost.org/trac/boost/ticket/6410
|
||||
# https://svn.boost.org/trac/boost/ticket/6413
|
||||
# https://svn.boost.org/trac/boost/ticket/6415
|
||||
Patch9: boost-1.50.0-attribute.patch
|
||||
Patch9: boost-1.53.0-attribute.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=783660
|
||||
# https://svn.boost.org/trac/boost/ticket/6459 fixed
|
||||
Patch10: boost-1.50.0-long-double-1.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=784654
|
||||
# https://svn.boost.org/trac/boost/ticket/7154
|
||||
Patch12: boost-1.50.0-polygon.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=828856
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=828857
|
||||
Patch15: boost-1.50.0-pool.patch
|
||||
@ -478,13 +468,11 @@ a number of significant features and is now developed independently
|
||||
%setup -q -n %{toplev_dirname}
|
||||
|
||||
# Fixes
|
||||
%patch2 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch7 -p2
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch12 -p3
|
||||
%patch15 -p0
|
||||
|
||||
# At least python2_version needs to be a macro so that it's visible in
|
||||
@ -970,6 +958,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_mandir}/man1/bjam.1*
|
||||
|
||||
%changelog
|
||||
* Thu Jan 24 2013 Petr Machata <pmachata@redhat.com> - 1.53.0-0.1.beta1
|
||||
- Upstream 1.53.0 beta1
|
||||
- Drop boost-1.50.0-signals-erase.patch
|
||||
- Port boost-1.50.0-attribute.patch
|
||||
- Drop boost-1.50.0-polygon.patch
|
||||
|
||||
* Sat Jan 26 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1.50.0-7
|
||||
- Rebuild for icu soname bump
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user