r44878 - in /packages/openturns/trunk/debian/patches: fix-tests-clang.patch ftbfs-clang.patch series
barbier-guest at users.alioth.debian.org
barbier-guest at users.alioth.debian.org
Tue May 22 22:01:10 UTC 2012
Author: barbier-guest
Date: Tue May 22 22:01:09 2012
New Revision: 44878
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44878
Log:
Allow building the Debian package with the clang compiler
Added:
packages/openturns/trunk/debian/patches/fix-tests-clang.patch
packages/openturns/trunk/debian/patches/ftbfs-clang.patch
Modified:
packages/openturns/trunk/debian/patches/series
Added: packages/openturns/trunk/debian/patches/fix-tests-clang.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/patches/fix-tests-clang.patch?rev=44878&op=file
==============================================================================
--- packages/openturns/trunk/debian/patches/fix-tests-clang.patch (added)
+++ packages/openturns/trunk/debian/patches/fix-tests-clang.patch Tue May 22 22:01:09 2012
@@ -1,0 +1,20 @@
+Description: Fix test failures when compiling with clang
+Author: Denis Barbier <bouzim at gmail.com>
+Origin: Debian
+Forwarded: no
+Last-Update: 2012-05-20
+
+Index: openturns/lib/src/Base/Func/MuParser/muParserBase.cpp
+===================================================================
+--- openturns.orig/lib/src/Base/Func/MuParser/muParserBase.cpp
++++ openturns/lib/src/Base/Func/MuParser/muParserBase.cpp
+@@ -1038,7 +1038,8 @@ namespace mu
+ continue;
+
+ case cmPOW:
+- Stack[--sidx] = MathImpl<value_type>::Pow(Stack[sidx], Stack[1+sidx]); ;
++ --sidx;
++ Stack[sidx] = MathImpl<value_type>::Pow(Stack[sidx], Stack[1+sidx]); ;
+ continue;
+
+ case cmLAND: --sidx; Stack[sidx] = Stack[sidx] && Stack[sidx+1]; continue;
Added: packages/openturns/trunk/debian/patches/ftbfs-clang.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/patches/ftbfs-clang.patch?rev=44878&op=file
==============================================================================
--- packages/openturns/trunk/debian/patches/ftbfs-clang.patch (added)
+++ packages/openturns/trunk/debian/patches/ftbfs-clang.patch Tue May 22 22:01:09 2012
@@ -1,0 +1,94 @@
+Description: Fix build failures when compiling with clang
+Author: Denis Barbier <bouzim at gmail.com>
+Origin: Debian
+Forwarded: no
+Last-Update: 2012-05-20
+
+Index: openturns/lib/src/Base/Common/OSS.hxx
+===================================================================
+--- openturns.orig/lib/src/Base/Common/OSS.hxx
++++ openturns/lib/src/Base/Common/OSS.hxx
+@@ -231,7 +231,7 @@
+
+ public:
+ /// Construct from an ostream.
+- OSS_iterator(ostream_type& __s) : _M_stream(&__s), _M_string(), _M_prefix(), _M_first(true) {}
++ OSS_iterator(ostream_type& __s) : _M_stream(&__s), _M_string(""), _M_prefix(""), _M_first(true) {}
+
+ /**
+ * Construct from an ostream
+Index: openturns/lib/src/Base/Common/Path.cxx
+===================================================================
+--- openturns.orig/lib/src/Base/Common/Path.cxx
++++ openturns/lib/src/Base/Common/Path.cxx
+@@ -210,7 +210,7 @@
+ std::string pathToSplit = openturnsWrapperDirectory;
+ unsigned int lastColonPosition = 0;
+ unsigned int currentColonPosition = 0;
+- while ( ((currentColonPosition = pathToSplit.find(Os::GetDirectoryListSeparator(), lastColonPosition)) >= 0) &&
++ while ( ((currentColonPosition = pathToSplit.find(Os::GetDirectoryListSeparator(), lastColonPosition)) != String::npos) &&
+ ( currentColonPosition < pathToSplit.size() ) ) {
+ FileName directory(pathToSplit, lastColonPosition, currentColonPosition - lastColonPosition);
+ if (directory.size() == 0) directory = ".";
+@@ -261,7 +261,7 @@
+ std::string pathToSplit = openturnsConfigDirectory;
+ unsigned int lastColonPosition = 0;
+ unsigned int currentColonPosition = 0;
+- while ( ((currentColonPosition = pathToSplit.find(Os::GetDirectoryListSeparator(), lastColonPosition)) >= 0) &&
++ while ( ((currentColonPosition = pathToSplit.find(Os::GetDirectoryListSeparator(), lastColonPosition)) != String::npos) &&
+ ( currentColonPosition < pathToSplit.size() ) ) {
+ FileName directory(pathToSplit, lastColonPosition, currentColonPosition - lastColonPosition);
+ if (directory.size() == 0) directory = ".";
+Index: openturns/lib/src/Base/Common/WrapperCommonFunctions.cxx
+===================================================================
+--- openturns.orig/lib/src/Base/Common/WrapperCommonFunctions.cxx
++++ openturns/lib/src/Base/Common/WrapperCommonFunctions.cxx
+@@ -1512,7 +1512,7 @@
+ while ( 1 ) {
+ /* searching shortcut in the regular expression (possibly modified in a previous pass) */
+ pos2 = regexpBeforeSubstitution.find( regexpShortcut, pos1 );
+- if ( (pos2 < 0) || (pos2 > static_cast<size_t>( regexpBeforeSubstitution.size() )) ) break;
++ if ( (pos2 == String::npos) || (pos2 > static_cast<size_t>( regexpBeforeSubstitution.size() )) ) break;
+
+ newRegexp.append( regexpBeforeSubstitution, pos1, pos2-pos1 ); /* We copy the part between two substituted substrings */
+ newRegexp.append( shortcutReplace ); /* We do the substitution */
+Index: openturns/lib/src/Base/Algo/kissfft.hh
+===================================================================
+--- openturns.orig/lib/src/Base/Algo/kissfft.hh
++++ openturns/lib/src/Base/Algo/kissfft.hh
+@@ -264,7 +264,8 @@
+ cpx_type * twiddles = &_twiddles[0];
+ cpx_type t;
+ int Norig = _nfft;
+- cpx_type scratchbuf[p];
++ std::vector<cpx_type> scratchbuf;
++ scratchbuf.resize(p);
+
+ for ( u=0; u<m; ++u ) {
+ k=u;
+Index: openturns/lib/test/t_BasisSequence_std.cxx
+===================================================================
+--- openturns.orig/lib/test/t_BasisSequence_std.cxx
++++ openturns/lib/test/t_BasisSequence_std.cxx
+@@ -35,7 +35,7 @@
+ {
+ TESTPREAMBLE;
+ OStream fullprint(std::cout);
+- UnsignedLong dimension = 3;
++ const UnsignedLong dimension = 3;
+ Description input;
+ Description output[dimension];
+ for ( UnsignedLong j = 0; j < dimension; ++ j )
+Index: openturns/lib/test/t_Basis_std.cxx
+===================================================================
+--- openturns.orig/lib/test/t_Basis_std.cxx
++++ openturns/lib/test/t_Basis_std.cxx
+@@ -37,7 +37,7 @@
+ TESTPREAMBLE;
+ OStream fullprint(std::cout);
+
+- UnsignedLong dimension = 3;
++ const UnsignedLong dimension = 3;
+ Description input;
+ Description output[dimension];
+ for ( UnsignedLong j = 0; j < dimension; ++ j )
Modified: packages/openturns/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/patches/series?rev=44878&op=diff
==============================================================================
--- packages/openturns/trunk/debian/patches/series (original)
+++ packages/openturns/trunk/debian/patches/series Tue May 22 22:01:09 2012
@@ -12,3 +12,5 @@
disable-test-wrapper.patch
test-output.patch
debian-soname.patch
+ftbfs-clang.patch
+fix-tests-clang.patch
More information about the debian-science-commits
mailing list