70 lines
1.9 KiB
Diff
70 lines
1.9 KiB
Diff
From 914f08e27ac82a95ce0ddedfbb15d53415406050 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
|
|
<alexey.pawlow@gmail.com>
|
|
Date: Thu, 17 Jun 2021 18:51:24 +0530
|
|
Subject: [PATCH 015/N] MINGW configure for shared build
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Co-authored-by: Алексей <alexey.pawlow@gmail.com>
|
|
---
|
|
configure.ac | 20 +++++++++++++++++++-
|
|
1 file changed, 19 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 52b3120..592b61a 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1240,6 +1240,13 @@ if test $enable_shared = "yes"; then
|
|
;;
|
|
|
|
esac
|
|
+ case $host in
|
|
+ *-*-mingw*)
|
|
+ LDLIBRARY='libpython$(LDVERSION).dll.a'
|
|
+ DLLLIBRARY='libpython$(LDVERSION).dll'
|
|
+ BLDLIBRARY='-L. -lpython$(LDVERSION)'
|
|
+ ;;
|
|
+ esac
|
|
else # shared is disabled
|
|
PY_ENABLE_SHARED=0
|
|
case $ac_sys_system in
|
|
@@ -1248,6 +1255,10 @@ else # shared is disabled
|
|
LDLIBRARY='libpython$(LDVERSION).dll.a'
|
|
;;
|
|
esac
|
|
+ case $host in
|
|
+ *-*-mingw*)
|
|
+ LDLIBRARY='libpython$(LDVERSION).a';;
|
|
+ esac
|
|
fi
|
|
|
|
if test "$cross_compiling" = yes; then
|
|
@@ -2843,6 +2854,12 @@ then
|
|
LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";;
|
|
*) LDSHARED="ld";;
|
|
esac
|
|
+ case $host in
|
|
+ *-*-mingw*)
|
|
+ LDSHARED='$(CC) -shared -Wl,--enable-auto-image-base'
|
|
+ LDCXXSHARED='$(CXX) -shared -Wl,--enable-auto-image-base'
|
|
+ ;;
|
|
+ esac
|
|
fi
|
|
AC_MSG_RESULT($LDSHARED)
|
|
LDCXXSHARED=${LDCXXSHARED-$LDSHARED}
|
|
@@ -5670,7 +5687,8 @@ case $host in
|
|
dnl "errmap.h" from $srcdir/PC.
|
|
dnl Note we cannot use BASECPPFLAGS as autogenerated pyconfig.h
|
|
dnl has to be before customized located in ../PC.
|
|
- CPPFLAGS="-I\$(srcdir)/PC $CPPFLAGS"
|
|
+ dnl (-I. at end is workaround for setup.py logic)
|
|
+ CPPFLAGS="-I\$(srcdir)/PC $CPPFLAGS -I."
|
|
;;
|
|
esac
|
|
|
|
--
|
|
2.32.0
|
|
|