rpms/blitz/devel blitz-gcc43.patch,1.1,1.2 blitz.spec,1.5,1.6
Sergio Pascual
sergiopr at fedoraproject.org
Tue Jan 20 08:59:56 UTC 2009
Author: sergiopr
Update of /cvs/pkgs/rpms/blitz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14116
Modified Files:
blitz-gcc43.patch blitz.spec
Log Message:
* Tue Jan 20 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9-8
- New patch (from upstream) to build with gcc4.3
blitz-gcc43.patch:
Index: blitz-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/blitz/devel/blitz-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blitz-gcc43.patch 17 Mar 2008 20:29:49 -0000 1.1
+++ blitz-gcc43.patch 20 Jan 2009 08:59:26 -0000 1.2
@@ -1,126 +1,14 @@
-diff -ur blitz-0.9/blitz/array/methods.cc blitz-0.9.gcc43/blitz/array/methods.cc
---- blitz-0.9/blitz/array/methods.cc 2004-09-17 01:50:26.000000000 +0200
-+++ blitz-0.9.gcc43/blitz/array/methods.cc 2008-03-04 07:58:07.000000000 +0100
-@@ -158,7 +158,7 @@
+diff -ur blitz-0.9/blitz/blitz.h blitz-0.9.gcc43/blitz/blitz.h
+--- blitz-0.9/blitz/blitz.h 2005-05-19 01:35:55.000000000 +0200
++++ blitz-0.9.gcc43/blitz/blitz.h 2009-01-20 09:54:00.000000000 +0100
+@@ -61,8 +61,10 @@
+
+ #ifdef BZ_MATH_FN_IN_NAMESPACE_STD
+ #include <cmath>
++ #include <cstdlib>
+ #else
+ #include <math.h>
++ #include <stdlib.h>
+ #endif
- for (int i=0; i < N_rank; ++i)
- {
-- int stride = BZ_MATHFN_SCOPE(abs)(stride_[i]);
-+ int stride = abs(stride_[i]);
- if (stride == 1)
- haveUnitStride = true;
-
-@@ -166,7 +166,7 @@
-
- int j = 0;
- for (j=0; j < N_rank; ++j)
-- if (BZ_MATHFN_SCOPE(abs)(stride_[j]) == vi)
-+ if (abs(stride_[j]) == vi)
- break;
-
- if (j == N_rank)
-diff -ur blitz-0.9/blitz/funcs.h blitz-0.9.gcc43/blitz/funcs.h
---- blitz-0.9/blitz/funcs.h 2005-10-08 03:22:55.000000000 +0200
-+++ blitz-0.9.gcc43/blitz/funcs.h 2008-03-03 23:48:55.000000000 +0100
-@@ -93,7 +93,7 @@
- BZ_DEFINE_UNARY_FUNC(Fn_cos,BZ_MATHFN_SCOPE(cos))
- BZ_DEFINE_UNARY_FUNC(Fn_cosh,BZ_MATHFN_SCOPE(cosh))
- BZ_DEFINE_UNARY_FUNC(Fn_exp,BZ_MATHFN_SCOPE(exp))
--BZ_DEFINE_UNARY_FUNC(Fn_fabs,BZ_MATHFN_SCOPE(fabs))
-+BZ_DEFINE_UNARY_FUNC(Fn_fabs,fabs)
- BZ_DEFINE_UNARY_FUNC(Fn_floor,BZ_MATHFN_SCOPE(floor))
- BZ_DEFINE_UNARY_FUNC(Fn_log,BZ_MATHFN_SCOPE(log))
- BZ_DEFINE_UNARY_FUNC(Fn_log10,BZ_MATHFN_SCOPE(log10))
-@@ -506,7 +506,7 @@
-
- static inline T_numtype
- apply(T_numtype1 a)
-- { return BZ_MATHFN_SCOPE(abs)(a); }
-+ { return abs(a); }
-
- template<typename T1>
- static inline void prettyPrint(BZ_STD_SCOPE(string) &str,
-@@ -527,7 +527,7 @@
-
- static inline T_numtype
- apply(T_numtype1 a)
-- { return BZ_MATHFN_SCOPE(labs)(a); }
-+ { return labs(a); }
-
- template<typename T1>
- static inline void prettyPrint(BZ_STD_SCOPE(string) &str,
-@@ -548,7 +548,7 @@
-
- static inline T_numtype
- apply(T_numtype1 a)
-- { return BZ_MATHFN_SCOPE(fabs)(a); }
-+ { return fabs(a); }
-
- template<typename T1>
- static inline void prettyPrint(BZ_STD_SCOPE(string) &str,
-@@ -569,7 +569,7 @@
-
- static inline T_numtype
- apply(T_numtype1 a)
-- { return BZ_MATHFN_SCOPE(fabs)(a); }
-+ { return fabs(a); }
-
- template<typename T1>
- static inline void prettyPrint(BZ_STD_SCOPE(string) &str,
-@@ -590,7 +590,7 @@
-
- static inline T_numtype
- apply(T_numtype1 a)
-- { return BZ_MATHFN_SCOPE(fabs)(a); }
-+ { return fabs(a); }
-
- template<typename T1>
- static inline void prettyPrint(BZ_STD_SCOPE(string) &str,
-diff -ur blitz-0.9/blitz/mathfunc.h blitz-0.9.gcc43/blitz/mathfunc.h
---- blitz-0.9/blitz/mathfunc.h 2005-05-18 22:22:38.000000000 +0200
-+++ blitz-0.9.gcc43/blitz/mathfunc.h 2008-03-03 23:36:00.000000000 +0100
-@@ -22,7 +22,7 @@
- typedef P_numtype1 T_numtype;
-
- static inline T_numtype apply(T_numtype1 x)
-- { return BZ_MATHFN_SCOPE(abs)(x); }
-+ { return abs(x); }
-
- template<typename T1>
- static void prettyPrint(BZ_STD_SCOPE(string) &str, prettyPrintFormat& format,
-@@ -42,7 +42,7 @@
- typedef long T_numtype;
-
- static inline T_numtype apply(T_numtype1 x)
-- { return BZ_MATHFN_SCOPE(labs)((long)x); }
-+ { return labs((long)x); }
-
- template<typename T1>
- static void prettyPrint(BZ_STD_SCOPE(string) &str, prettyPrintFormat& format,
-@@ -62,7 +62,7 @@
- typedef float T_numtype;
-
- static inline T_numtype apply(T_numtype1 x)
-- { return BZ_MATHFN_SCOPE(fabs)((float)x); }
-+ { return fabs((float)x); }
-
- template<typename T1>
- static void prettyPrint(BZ_STD_SCOPE(string) &str, prettyPrintFormat& format,
-@@ -82,7 +82,7 @@
- typedef double T_numtype;
-
- static inline T_numtype apply(T_numtype1 x)
-- { return BZ_MATHFN_SCOPE(fabs)((double)x); }
-+ { return fabs((double)x); }
-
- template<typename T1>
- static void prettyPrint(BZ_STD_SCOPE(string) &str, prettyPrintFormat& format,
-@@ -102,7 +102,7 @@
- typedef long double T_numtype;
-
- static inline T_numtype apply(T_numtype1 x)
-- { return BZ_MATHFN_SCOPE(fabs)((long double)x); }
-+ { return fabs((long double)x); }
-
- template<typename T1>
- static void prettyPrint(BZ_STD_SCOPE(string) &str, prettyPrintFormat& format,
+ #ifdef BZ_HAVE_COMPLEX
Index: blitz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blitz/devel/blitz.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- blitz.spec 12 Mar 2008 16:02:40 -0000 1.5
+++ blitz.spec 20 Jan 2009 08:59:26 -0000 1.6
@@ -1,6 +1,6 @@
Name: blitz
Version: 0.9
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: C++ class library for matrix scientific computing
Group: Development/Libraries
@@ -105,7 +105,10 @@
%changelog
-* Mon Mar 03 2008 Sergio Pascual <spr at astrax.fis.ucm.es> 0.9-7
+* Tue Jan 20 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9-8
+- New patch (from upstream) to build with gcc4.3
+
+* Mon Mar 03 2008 Sergio Pascual <spr at astrax.fis.ucm.es> - 0.9-7
- Patch to build with gcc4.3
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9-6
More information about the scm-commits
mailing list