diff -ur /build/dan/src/M2/M2/BUILD/dan/builds.tmp/sl64.production/libraries/fflas_ffpack/tmp/fflas-ffpack-2.2.2/macros/fflas-ffpack-blas.m4 fflas-ffpack-2.2.2/macros/fflas-ffpack-blas.m4
--- /build/dan/src/M2/M2/BUILD/dan/builds.tmp/sl64.production/libraries/fflas_ffpack/tmp/fflas-ffpack-2.2.2/macros/fflas-ffpack-blas.m4	2016-06-14 04:07:50.000000000 -0400
+++ fflas-ffpack-2.2.2/macros/fflas-ffpack-blas.m4	2017-06-07 00:24:03.289843718 -0400
@@ -29,7 +29,7 @@
 			[AC_HELP_STRING([--with-blas-cflags=<cflags>],
 				[ CFLAGS for BLAS/LAPACK (i.e. -I/path/to/toto-blas) ])
 			])
-		CBLAS_FLAG="$with_blas_cflags -D__FFLASFFPACK_HAVE_CBLAS"
+		CBLAS_FLAG="$with_blas_cflags -U__FFLASFFPACK_HAVE_CBLAS"
 		AC_SUBST(CBLAS_FLAG)
 		dnl  echo $CBLAS_FLAG;
 		]
diff -ur /home/dan/src/M2/M2/BUILD/dan/builds.tmp/sl64.production/libraries/fflas_ffpack/tmp/fflas-ffpack-2.2.2/fflas-ffpack/fflas/fflas_sparse/read_sparse.h fflas-ffpack-2.2.2/fflas-ffpack/fflas/fflas_sparse/read_sparse.h
--- /home/dan/src/M2/M2/BUILD/dan/builds.tmp/sl64.production/libraries/fflas_ffpack/tmp/fflas-ffpack-2.2.2/fflas-ffpack/fflas/fflas_sparse/read_sparse.h	2015-07-27 10:22:28.000000000 -0400
+++ fflas-ffpack-2.2.2/fflas-ffpack/fflas/fflas_sparse/read_sparse.h	2017-06-07 08:47:36.723590243 -0400
@@ -234,8 +234,8 @@
 		std::vector<Coo<Field>> data;
 		nnz = 0;
 		uint64_t itLine = 0;
-		while (std::getline(file, line)) {
-			tokens.resize(0);
+		while (!file.eof()) {
+			std::getline(file, line);
 			std::istringstream iss(line);
 
 			std::copy(std::istream_iterator<std::string>(iss), std::istream_iterator<std::string>(),
