- Apply a function_template patch from Caolan McNamara
- Resolves: #477131
This commit is contained in:
parent
911173175d
commit
463220e7bb
14
boost-function_template.patch
Normal file
14
boost-function_template.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
--- boost/function/function_template.hpp.orig 2008-12-19 10:32:27.000000000 +0000
|
||||||
|
+++ boost/function/function_template.hpp 2008-12-19 10:33:27.000000000 +0000
|
||||||
|
@@ -950,10 +950,10 @@
|
||||||
|
f.vtable->manager(f.functor, this->functor,
|
||||||
|
boost::detail::function::move_functor_tag);
|
||||||
|
f.vtable = 0;
|
||||||
|
-#if !defined(BOOST_NO_EXCEPTIONS)
|
||||||
|
} else {
|
||||||
|
clear();
|
||||||
|
}
|
||||||
|
+#if !defined(BOOST_NO_EXCEPTIONS)
|
||||||
|
} catch (...) {
|
||||||
|
vtable = 0;
|
||||||
|
throw;
|
@ -4,7 +4,7 @@
|
|||||||
Name: boost
|
Name: boost
|
||||||
Summary: The Boost C++ Libraries
|
Summary: The Boost C++ Libraries
|
||||||
Version: 1.37.0
|
Version: 1.37.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: Boost
|
License: Boost
|
||||||
URL: http://www.boost.org/
|
URL: http://www.boost.org/
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -26,6 +26,7 @@ Patch1: boost-use-rpm-optflags.patch
|
|||||||
Patch2: boost-run-tests.patch
|
Patch2: boost-run-tests.patch
|
||||||
Patch3: boost-gcc43.patch
|
Patch3: boost-gcc43.patch
|
||||||
Patch4: boost-gcc-soname.patch
|
Patch4: boost-gcc-soname.patch
|
||||||
|
Patch5: boost-function_template.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Boost provides free peer-reviewed portable C++ source libraries. The
|
Boost provides free peer-reviewed portable C++ source libraries. The
|
||||||
@ -70,6 +71,7 @@ HTML documentation files for Boost C++ libraries.
|
|||||||
%patch2 -p0
|
%patch2 -p0
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
sed 's/!!!SONAME!!!/%{sonamever}/' %{PATCH4} | %{__patch} -p1
|
sed 's/!!!SONAME!!!/%{sonamever}/' %{PATCH4} | %{__patch} -p1
|
||||||
|
%patch5 -p0
|
||||||
|
|
||||||
%build
|
%build
|
||||||
BOOST_ROOT=`pwd`
|
BOOST_ROOT=`pwd`
|
||||||
@ -202,6 +204,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%doc %{_docdir}/%{name}-%{version}
|
%doc %{_docdir}/%{name}-%{version}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Dec 19 2008 Petr Machata <pmachata@redhat.com> - 1.37.0-2
|
||||||
|
- Apply a function_template patch from Caolan McNamara
|
||||||
|
- Resolves: #477131
|
||||||
|
|
||||||
* Tue Dec 16 2008 Benjamin Kosnik <bkoz@redhat.com> - 1.37.0-1
|
* Tue Dec 16 2008 Benjamin Kosnik <bkoz@redhat.com> - 1.37.0-1
|
||||||
- Fix rpmlint rpath errors.
|
- Fix rpmlint rpath errors.
|
||||||
- Fix rpmlint warnings on tabs and spaces.
|
- Fix rpmlint warnings on tabs and spaces.
|
||||||
|
Loading…
Reference in New Issue
Block a user