From: Daniel Elstner <redacted>
Date: Sun, 11 Oct 2015 10:12:28 +0000 (+0200)
Subject: SWIG: Define "noexcept" empty to work around SWIG bug
X-Git-Tag: libsigrok-0.4.0~178
X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=c6e18e007a2ee65cc1fe03fb7e86ac5fe47d7907

SWIG: Define "noexcept" empty to work around SWIG bug

The SWIG 2.0.12 on my system bails out with a syntax error on the
"noexcept" keyword in C++11 code. Define "noexcept" to nothing (for
the SWIG parser only) to work around this problem.
---

diff --git a/Makefile.am b/Makefile.am
index fb925ce6..582b38f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -651,7 +651,7 @@ $(JCXX): $(srcdir)/$(JSWG) $(JDOC) bindings/swig/classes.i bindings/swig/enums.i
 		$(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
 		$(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS)
 	-$(AM_V_at)rm -f $(java_cleanfiles)
-	$(AM_V_GEN)$(SWIG) -c++ -java -package org.sigrok.core.classes \
+	$(AM_V_GEN)$(SWIG) -c++ -Dnoexcept= -java -package org.sigrok.core.classes \
 		-Ibindings -I$(JCLS) $(local_includes) -I$(srcdir) $(JNI_CPPFLAGS) \
 		-outdir $(JCLS) -o $@ $(srcdir)/$(JSWG)
 
diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 3fb0474a..c70fffca 100644
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -87,8 +87,8 @@ setup(
     ext_modules = [
         Extension('sigrok.core._classes',
             sources = [vpath('sigrok/core/classes.i')],
-            swig_opts = ['-c++', '-threads', '-Isigrok/core', '-I..', '-I' + srcdir_parent] +
-                ['-I%s' % i for i in includes],
+            swig_opts = ['-c++', '-threads', '-Dnoexcept=', '-Isigrok/core',
+                '-I..', '-I' + srcdir_parent] + ['-I%s' % i for i in includes],
             extra_compile_args = ['-Wno-uninitialized'],
             include_dirs = includes,
             library_dirs = libdirs,