[Pkg-octave-commit] [SCM] UNNAMED PROJECT branch, master, updated. 9e4ab9ff627998fc000541cb525ab88e146843f9
Rafael Laboissiere
rafael at laboissiere.net
Fri Mar 30 15:32:21 UTC 2012
The following commit has been merged in the master branch:
commit e347c37d7b6068c66477b40c40e4c295cd0ea403
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date: Fri Mar 30 17:20:55 2012 +0200
debian/patches/openmp-fix.patch: New patch
diff --git a/debian/patches/openmp-fix.patch b/debian/patches/openmp-fix.patch
new file mode 100644
index 0000000..4405d3c
--- /dev/null
+++ b/debian/patches/openmp-fix.patch
@@ -0,0 +1,24 @@
+Description: Fix compilation of src/bspeval.cc
+ The bug is due to a change in the behaviour of openmp in new versions
+ of gcc.
+Author: Carlo de Falco <carlo.defalco at gmail.com>
+Origin: upstream, http://octave.svn.sourceforge.net/viewvc/octave?view=revision&revision=9946
+Last-Update: 2012-03-30
+
+--- octave-nurbs-1.3.6.orig/src/bspeval.cc
++++ octave-nurbs-1.3.6/src/bspeval.cc
+@@ -44,10 +44,10 @@ DEFUN_DLD(bspeval, args, nargout,"\
+ octave_value_list retval;
+ if (!bspeval_bad_arguments (args))
+ {
+- int d = args(0).int_value();
+- const Matrix c = args(1).matrix_value();
+- const RowVector k = args(2).row_vector_value();
+- const NDArray u = args(3).array_value();
++ int d = args(0).int_value();
++ Matrix c = args(1).matrix_value();
++ RowVector k = args(2).row_vector_value();
++ NDArray u = args(3).array_value();
+
+ octave_idx_type nu = u.length();
+ octave_idx_type mc = c.rows(),
diff --git a/debian/patches/series b/debian/patches/series
index 6f889c5..4ca3e82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
autoload-yes.diff
+openmp-fix.patch
--
UNNAMED PROJECT
More information about the Pkg-octave-commit
mailing list