Merge branch 'SWIG-config-cleanup' into 'master'

SWIG: move flat namespace flag for Python wrappings to its own variable

See merge request !2149

gnuscripts/lalsuite_swig.am

@@ -243,7 +243,7 @@ nodist_swiglal_python_la_SOURCES = swiglal_@PACKAGE@_python.c
 swiglal_python_la_SOURCES = SWIGTest.c
 swiglal_python_la_CPPFLAGS = $(swig_cppflags) $(SWIG_PYTHON_CPPFLAGS) $(LAL_SYSTEM_INCLUDES)
 swiglal_python_la_CFLAGS = $(SWIG_PYTHON_CFLAGS)
-swiglal_python_la_LDFLAGS = $(LDADD) $(swig_ldflags) $(SWIG_PYTHON_LDFLAGS) $(EXTRA_SWIG_PYTHON_LDFLAGS)
+swiglal_python_la_LDFLAGS = $(LDADD) $(swig_ldflags) $(SWIG_PYTHON_LDFLAGS) $(SWIG_PYTHON_FLAT_NAMESPACE_LDFLAG)
 swiglal_python_la_LIBTOOLFLAGS = $(swig_libtoolflags)
 
 if AMDEP

gnuscripts/lalsuite_swig.m4

@@ -2,7 +2,7 @@
 # lalsuite_swig.m4 - SWIG configuration
 # Author: Karl Wette, 2011--2017
 #
-# serial 117
+# serial 118
 
 AC_DEFUN([_LALSUITE_MIN_SWIG_VERSION],[
   # $0: minimum version of SWIG and other dependencies
@@ -519,8 +519,10 @@ EOF
         )
       done
     done
+    AC_ARG_VAR([EXTRA_SWIG_OCTAVE_LDFLAGS],[Extra linker flags for SWIG Octave bindings])
     LALSUITE_CHECK_LINK_FLAGS([
       ${swig_octave_ldflags}
+      ${EXTRA_SWIG_OCTAVE_LDFLAGS}
       ],[SWIG_OCTAVE_LDFLAGS="${SWIG_OCTAVE_LDFLAGS} ${flag}"]
     )
 
@@ -661,20 +663,19 @@ EOD`]
         [swig_python_ldflags="${swig_python_ldflags}${flag} "]
       )
     done
+    AC_ARG_VAR([EXTRA_SWIG_PYTHON_LDFLAGS],[Extra linker flags for SWIG Python bindings])
     LALSUITE_CHECK_LINK_FLAGS([
       ${swig_python_ldflags}
+      ${EXTRA_SWIG_PYTHON_LDFLAGS}
       ],[SWIG_PYTHON_LDFLAGS="${SWIG_PYTHON_LDFLAGS} ${flag}"]
     )
 
-    # allow addition of extra Python linker flags
-    AC_ARG_VAR([EXTRA_SWIG_PYTHON_LDFLAGS],[Extra linker flags for SWIG Python bindings])
-
-    extra_swig_python_ldflags="-Wl,-flat_namespace"
-    AC_SUBST([extra_swig_python_ldflags])
-
+    # link Python SWIG wrappings with a flat namespace on macOS
+    # - https://git.ligo.org/waveforms/reviews/newwfinterface/-/wikis/Fixing-CI-failures-due-to-segmentation-faults-on-macOS
+    AC_SUBST([SWIG_PYTHON_FLAT_NAMESPACE_LDFLAG])
     LALSUITE_CHECK_LINK_FLAGS([
-      ${extra_swig_python_ldflags}
-      ],[EXTRA_SWIG_PYTHON_LDFLAGS="${EXTRA_SWIG_PYTHON_LDFLAGS} ${flag}"]
+      [-Wl,-flat_namespace]
+      ],[SWIG_PYTHON_FLAT_NAMESPACE_LDFLAG="${SWIG_PYTHON_FLAT_NAMESPACE_LDFLAG} ${flag}"]
     )
 
     # check for Python and NumPy headers

lalinspiral/python/lalinspiral/Makefile.am

@@ -32,7 +32,7 @@ pymodule_LTLIBRARIES = _thinca.la
 _thinca_la_SOURCES = _thinca.c
 _thinca_la_CPPFLAGS = $(AM_CPPFLAGS) $(SWIG_PYTHON_CPPFLAGS) -DMODULE_NAME="\"lalinspiral._thinca\""
 _thinca_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing -DMODULE_NAME="\"lalinspiral._thinca\""
-_thinca_la_LDFLAGS = $(AM_LDFLAGS) $(SWIG_PYTHON_LIBS) -module -avoid-version $(EXTRA_SWIG_PYTHON_LDFLAGS)
+_thinca_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version $(SWIG_PYTHON_FLAT_NAMESPACE_LDFLAG)
 
 thinca-all-local: _thinca.so