[mathicgb] 386/393: Fixed ana Makefile target to work by removing option -fsyntax-only. We only really need the syntax check, but autotools thinks something is wrong since it cannot make executables with that flag.

Doug Torrance dtorrance-guest at moszumanska.debian.org
Fri Apr 3 15:59:38 UTC 2015


This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository mathicgb.

commit 93d8985cbdcca989e60175d7b1ca660cacb857a5
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date:   Tue Sep 24 12:46:54 2013 +0200

    Fixed ana Makefile target to work by removing option -fsyntax-only. We only really need the syntax check, but autotools thinks something is wrong since it cannot make executables with that flag.
---
 build/setup/make-Makefile.sh   | 5 +++--
 src/mathicgb/F4ProtoMatrix.hpp | 1 +
 src/mathicgb/mtbb.hpp          | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build/setup/make-Makefile.sh b/build/setup/make-Makefile.sh
index 1c9fb12..dc28f1b 100755
--- a/build/setup/make-Makefile.sh
+++ b/build/setup/make-Makefile.sh
@@ -93,14 +93,15 @@ anaIndex=${#targetsName[@]};
 targetsName+=("ana");
 targetsDescription+=("Build with many warnings turned on and -Werror.");
 targetsCPPFLAGS+=("-Wall -Wextra -Wno-uninitialized -Wno-unused-parameter\
-  -fsyntax-only -O1 -Wfloat-equal -Wundef\
+   -O1 -Wfloat-equal -Wundef\
   -Wno-endif-labels -Wshadow -Wlarger-than-1000 -Wpointer-arith \
   -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare \
   -Waggregate-return -Wmissing-noreturn -Wmissing-format-attribute \
   -Wno-multichar -Wno-deprecated-declarations -Wpacked \
   -Wno-redundant-decls -Wunreachable-code -Winline \
   -Wno-invalid-offsetof -Winvalid-pch -Wlong-long \
-  -Wdisabled-optimization -D DEBUG -Werror");
+  -Wdisabled-optimization -DMEMTAILOR_DEBUG -DMATHIC_DEBUG -DMATHICGB_DEBUG \
+  -Werror");
 targetsCXXFLAGS+=("");
 targetsLDFLAGS+=("");
 targetsMakeArgs+=("");
diff --git a/src/mathicgb/F4ProtoMatrix.hpp b/src/mathicgb/F4ProtoMatrix.hpp
index d4efd45..64e81cd 100755
--- a/src/mathicgb/F4ProtoMatrix.hpp
+++ b/src/mathicgb/F4ProtoMatrix.hpp
@@ -52,3 +52,4 @@ private:
 
 MATHICGB_NAMESPACE_END
 #endif
+    
\ No newline at end of file
diff --git a/src/mathicgb/mtbb.hpp b/src/mathicgb/mtbb.hpp
index 1d28006..1a02641 100755
--- a/src/mathicgb/mtbb.hpp
+++ b/src/mathicgb/mtbb.hpp
@@ -8,6 +8,14 @@
 
 MATHICGB_NAMESPACE_BEGIN
 
+/// A compatibility layer for tbb. If we are compiling with tbb present, then
+/// these classes will simply be the same classes as in tbb. However, if we
+/// are compiling without tbb (so without parallelism), then these classes will
+/// be trivial non-parallel implementations that allows MathicGB to work
+/// without tbb being present. TBB doesn't work on Cygwin, so that is at least
+/// one good reason to have this compatibility layer. This only works if all
+/// uses of tbb go through mtbb, so make sure to do that.
+
 namespace mtbb {
   using ::tbb::task_scheduler_init;
   using ::tbb::mutex;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathicgb.git



More information about the debian-science-commits mailing list