[patch] 0001-testhelper-only-link-against-libpython-on-Windows.patch

0001-testhelper-only-link-against-libpython-on-Windows.patch (text/plain), 2.41 KB, created by Gilles Dartiguelongue (RETIRED) on 2017-09-13 07:03:23 UTC

From 707c59f64006c14fabc12beb29fc2cfa394ade82 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <[e-mail]>
Date: Thu, 23 Mar 2017 22:32:23 +0100
Subject: [PATCH] testhelper: only link against libpython on Windows

https://bugzilla.gnome.org/show_bug.cgi?id=773803
Signed-off-by: Gilles Dartiguelongue <[e-mail]>
---
 configure.ac      |  6 +++---
 tests/Makefile.am | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index c8d95c78..c8fd6a6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
-AC_MSG_CHECKING([for build time linking with Python (Darwin and Win32)])
+AC_MSG_CHECKING([for build time linking with Python (Win32)])
 case "$host" in
   *-*-mingw*|*-*-cygwin*)
     os_win32=yes
@@ -62,7 +62,7 @@ case "$host" in
     ;;
   *-*-darwin*)
     os_win32=no
-    link_python_libs=yes
+    link_python_libs=no
     OS_EXT=dylib
     ;;
   *)
@@ -121,7 +121,7 @@ AC_SUBST(PYTHON_SO)
 
 AM_CHECK_PYTHON_HEADERS(, AC_MSG_ERROR([Python headers not found]))
 if test "x$link_python_libs" = "xyes"; then
-  AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows and Darwin require Python modules to be explicitly linked to libpython.]))
+  AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows require Python modules to be explicitly linked to libpython.]))
 fi
 
 AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3c907f14..16973cc6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,12 @@
 CLEANFILES =
 check_LTLIBRARIES = libgimarshallingtests.la
 test_typelibs = GIMarshallingTests-1.0.typelib
+extension_libadd =
+
+if OS_WIN32
+extension_libadd += \
+	$(PYTHON_LIBS)
+endif
 
 nodist_libgimarshallingtests_la_SOURCES = \
 	$(GI_DATADIR)/tests/gimarshallingtests.c \
@@ -64,8 +70,8 @@ CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIM
 check_LTLIBRARIES += testhelper.la
 
 testhelper_la_CFLAGS = -I$(top_srcdir)/gi $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
-testhelper_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LIBS)
-testhelper_la_LIBADD = $(GLIB_LIBS)
+testhelper_la_LDFLAGS = -module -avoid-version -no-undefined
+testhelper_la_LIBADD = $(GLIB_LIBS) $(extension_libadd)
 testhelper_la_SOURCES = \
 	testhelpermodule.c \
 	test-floating.c \
-- 
2.14.1