Hello community,
here is the log from the commit of package glucat for openSUSE:Factory checked in at 2013-06-11 06:33:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glucat (Old)
and /work/SRC/openSUSE:Factory/.glucat.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glucat"
Changes:
--------
--- /work/SRC/openSUSE:Factory/glucat/glucat.changes 2013-01-10 11:18:03.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.glucat.new/glucat.changes 2013-06-11 09:27:25.000000000 +0200
@@ -1,0 +2,9 @@
+Sat Jun 8 13:45:10 UTC 2013 - badshah400@gmail.com
+
+- Add glucat-build-with-updated-boost.patch to fix building with
+ boost > 1.50; patch came from upstream
+- Include INSTALL file in package since it provides important
+ information for compiling code built against glucat on
+ openSUSE > 12.3.
+
+-------------------------------------------------------------------
New:
----
glucat-build-with-updated-boost.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glucat.spec ++++++
--- /var/tmp/diff_new_pack.6im63g/_old 2013-06-11 09:27:26.000000000 +0200
+++ /var/tmp/diff_new_pack.6im63g/_new 2013-06-11 09:27:26.000000000 +0200
@@ -25,6 +25,8 @@
Url: http://glucat.sourceforge.net/
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: glucat-fix-i586-build.patch
+#PATCH-FIX-UPSTREAM glucat-build-with-updated-boost.patch badshah400@gmail.com -- Fix building with updated boost; patch came from upstream
+Patch1: glucat-build-with-updated-boost.patch
BuildRequires: boost-devel
BuildRequires: gcc-c++
BuildRequires: python-Cython
@@ -72,6 +74,7 @@
%ifarch i586
%patch0 -p1
%endif
+%patch1 -p1
%build
# Parallel make fails for openSUSE 11.4 and lower
%configure --prefix=%{buildroot}%{_prefix}/
@@ -88,7 +91,7 @@
%files devel
%defattr(-,root,root)
%{_includedir}/%{name}/
-%doc AUTHORS ChangeLog README COPYING TODO
+%doc AUTHORS INSTALL ChangeLog README COPYING TODO
%files -n python-glucat
%defattr(-,root,root)
++++++ glucat-build-with-updated-boost.patch ++++++
diff -rub glucat-0.7.1/glucat/framed_multi.h glucat-0.7.1.patched/glucat/framed_multi.h
--- glucat-0.7.1/glucat/framed_multi.h 2012-10-10 23:49:20.000000000 +1100
+++ glucat-0.7.1.patched/glucat/framed_multi.h 2013-06-08 16:24:08.000000000 +1000
@@ -35,8 +35,10 @@
#include "glucat/errors.h"
#include "glucat/clifford_algebra.h"
+#if defined(_GLUCAT_USE_BOOST_POOL_ALLOC)
// Use the Boost pool allocator
#include
+#endif
#include <string>
#include <utility>
@@ -151,8 +153,11 @@
private std::unordered_map< const index_set, Scalar_T, index_set_hash >
#else
private std::map< const index_set, Scalar_T,
- std::less< const index_set >,
- boost::fast_pool_allocator< std::pair, Scalar_T> > >
+ std::less< const index_set >
+#if defined(_GLUCAT_USE_BOOST_POOL_ALLOC)
+ , boost::fast_pool_allocator< std::pair, Scalar_T> >
+#endif
+ >
#endif
{
public:
@@ -171,8 +176,11 @@
typedef class var_term var_term_t;
typedef typename matrix_multi_t::matrix_t matrix_t;
typedef std::map< const index_set_t, Scalar_T,
- std::less<const index_set_t>,
- boost::fast_pool_allocator >
+ std::less<const index_set_t>
+#if defined(_GLUCAT_USE_BOOST_POOL_ALLOC)
+ , boost::fast_pool_allocator
+#endif
+ >
sorted_map_t;
#if defined(_GLUCAT_USE_GNU_CXX_HASH_MAP)
typedef __gnu_cxx::hash_map< const index_set_t, Scalar_T, index_set_hash >
diff -rub glucat-0.7.1/glucat/framed_multi_imp.h glucat-0.7.1.patched/glucat/framed_multi_imp.h
--- glucat-0.7.1/glucat/framed_multi_imp.h 2012-11-07 00:38:27.000000000 +1100
+++ glucat-0.7.1.patched/glucat/framed_multi_imp.h 2013-06-08 16:23:42.000000000 +1000
@@ -36,8 +36,10 @@
#include "glucat/random.h"
+#if defined(_GLUCAT_USE_BOOST_POOL_ALLOC)
// Use the Boost pool allocator
#include
+#endif
#include <sstream>
#include <fstream>
diff -rub glucat-0.7.1/INSTALL glucat-0.7.1.patched/INSTALL
--- glucat-0.7.1/INSTALL 2012-11-10 19:54:41.000000000 +1100
+++ glucat-0.7.1.patched/INSTALL 2013-06-08 17:27:14.000000000 +1000
@@ -325,6 +325,32 @@
This tells g++ to use the 2011 C++ standard.
+[Added in patch for openSUSE Build Service using Boost 1.53.0:]
+
+If _GLUCAT_USE_BOOST_POOL_ALLOC is defined, glucat/framed_multi.h includes
+the header file and defines glucat::framed_multi<>
+using boost::fast_pool_allocator<>; and glucat/framed_multi.h includes
+the header file .
+
+If you are compiling your own programs using the GluCat library, to use the
+Boost pool allocator, your Makefile needs to pass the following flag to the
+C++ compiler: "-D_GLUCAT_USE_BOOST_POOL_ALLOC"
+
+You will also need to ensure that the include path used by the compiler sees
+ and . In addition, if you
+are using Boost 1.50.0 or later, your Makefile needs to pass the following flag
+to the C++ compiler, after all the linker-related flags: "-lboost_system"
+
+You will also need to ensure that the library path sees libboost_system.*.
+This requires that you have the Boost libraries built and installed.
+See http://www.boost.org/doc/libs/1_53_0/more/getting_started/index.html
+and Boost tickets
+https://svn.boost.org/trac/boost/ticket/7085
+https://svn.boost.org/trac/boost/ticket/7335
+
+[End of addition for openSUSE Build Service using Boost 1.53.0]
+
+
--with-dense-mat uses dense matrices [default=yes]
This option controls the preprocessor symbol _GLUCAT_USE_DENSE_MATRICES that
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
