Allow plpython to build on Win32.
Magnus Hagander
This commit is contained in:
Bruce Momjian
parent
4542581bf1
commit
5431393274
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Autoconf macros for configuring the build of Python extension modules
|
||||
#
|
||||
# $PostgreSQL: pgsql/config/python.m4,v 1.8 2004/09/16 23:30:30 joe Exp $
|
||||
# $PostgreSQL: pgsql/config/python.m4,v 1.9 2004/10/06 09:20:40 momjian Exp $
|
||||
#
|
||||
|
||||
# PGAC_PATH_PYTHON
|
||||
@ -34,15 +34,13 @@ python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"`
|
||||
python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
|
||||
python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
|
||||
python_configdir=`${PYTHON} -c "from distutils.sysconfig import get_python_lib as f; import os; print os.path.join(f(plat_specific=1,standard_lib=1),'config')"`
|
||||
python_includespec="-I${python_prefix}/include/python${python_version}"
|
||||
if test "$python_prefix" != "$python_execprefix"; then
|
||||
python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
|
||||
fi
|
||||
python_includespec=`${PYTHON} -c "import distutils.sysconfig; print '-I'+distutils.sysconfig.get_python_inc()"`
|
||||
|
||||
AC_SUBST(python_prefix)[]dnl
|
||||
AC_SUBST(python_execprefix)[]dnl
|
||||
AC_SUBST(python_configdir)[]dnl
|
||||
AC_SUBST(python_includespec)[]dnl
|
||||
AC_SUBST(python_version)[]dnl
|
||||
# This should be enough of a message.
|
||||
if test "$python_prefix" != "$python_execprefix"; then
|
||||
AC_MSG_RESULT([$python_prefix/lib/python${python_version} and $python_execprefix/lib/python${python_version}])
|
||||
@ -54,24 +52,11 @@ fi
|
||||
|
||||
# PGAC_CHECK_PYTHON_EMBED_SETUP
|
||||
# -----------------------------
|
||||
# Courtesy of the INN 2.3.1 package...
|
||||
AC_DEFUN([PGAC_CHECK_PYTHON_EMBED_SETUP],
|
||||
[AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS])
|
||||
AC_MSG_CHECKING([how to link an embedded Python application])
|
||||
|
||||
if test ! -f "$python_configdir/Makefile"; then
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_ERROR([Python Makefile not found])
|
||||
fi
|
||||
|
||||
_python_libs=`grep '^LIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
|
||||
_python_libc=`grep '^LIBC=' $python_configdir/Makefile | sed 's/^.*=//'`
|
||||
_python_libm=`grep '^LIBM=' $python_configdir/Makefile | sed 's/^.*=//'`
|
||||
_python_liblocalmod=`grep '^LOCALMODLIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
|
||||
_python_libbasemod=`grep '^BASEMODLIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
|
||||
|
||||
pgac_tab=" " # tab character
|
||||
python_libspec=`echo X"-L$python_configdir $_python_libs $_python_libc $_python_libm -lpython$python_version $_python_liblocalmod $_python_libbasemod" | sed -e 's/^X//' -e "s/[[ $pgac_tab]][[ $pgac_tab]]*/ /g"`
|
||||
python_libspec=`${PYTHON} -c "import distutils.sysconfig,string;print string.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','LOCALMODLIBS','BASEMODLIBS')))"`
|
||||
|
||||
AC_MSG_RESULT([${python_libspec}])
|
||||
|
||||
|
||||
23
configure
vendored
23
configure
vendored
@ -4241,10 +4241,7 @@ python_version=`${PYTHON} -c "import sys; print sys.version[:3]"`
|
||||
python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
|
||||
python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
|
||||
python_configdir=`${PYTHON} -c "from distutils.sysconfig import get_python_lib as f; import os; print os.path.join(f(plat_specific=1,standard_lib=1),'config')"`
|
||||
python_includespec="-I${python_prefix}/include/python${python_version}"
|
||||
if test "$python_prefix" != "$python_execprefix"; then
|
||||
python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
|
||||
fi
|
||||
python_includespec=`${PYTHON} -c "import distutils.sysconfig; print '-I'+distutils.sysconfig.get_python_inc()"`
|
||||
|
||||
# This should be enough of a message.
|
||||
if test "$python_prefix" != "$python_execprefix"; then
|
||||
@ -4259,22 +4256,7 @@ fi
|
||||
echo "$as_me:$LINENO: checking how to link an embedded Python application" >&5
|
||||
echo $ECHO_N "checking how to link an embedded Python application... $ECHO_C" >&6
|
||||
|
||||
if test ! -f "$python_configdir/Makefile"; then
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
{ { echo "$as_me:$LINENO: error: Python Makefile not found" >&5
|
||||
echo "$as_me: error: Python Makefile not found" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
_python_libs=`grep '^LIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
|
||||
_python_libc=`grep '^LIBC=' $python_configdir/Makefile | sed 's/^.*=//'`
|
||||
_python_libm=`grep '^LIBM=' $python_configdir/Makefile | sed 's/^.*=//'`
|
||||
_python_liblocalmod=`grep '^LOCALMODLIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
|
||||
_python_libbasemod=`grep '^BASEMODLIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
|
||||
|
||||
pgac_tab=" " # tab character
|
||||
python_libspec=`echo X"-L$python_configdir $_python_libs $_python_libc $_python_libm -lpython$python_version $_python_liblocalmod $_python_libbasemod" | sed -e 's/^X//' -e "s/[ $pgac_tab][ $pgac_tab]*/ /g"`
|
||||
python_libspec=`${PYTHON} -c "import distutils.sysconfig,string;print string.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','LOCALMODLIBS','BASEMODLIBS')))"`
|
||||
|
||||
echo "$as_me:$LINENO: result: ${python_libspec}" >&5
|
||||
echo "${ECHO_T}${python_libspec}" >&6
|
||||
@ -18778,6 +18760,7 @@ s,@python_prefix@,$python_prefix,;t t
|
||||
s,@python_execprefix@,$python_execprefix,;t t
|
||||
s,@python_configdir@,$python_configdir,;t t
|
||||
s,@python_includespec@,$python_includespec,;t t
|
||||
s,@python_version@,$python_version,;t t
|
||||
s,@python_libspec@,$python_libspec,;t t
|
||||
s,@LIBOBJS@,$LIBOBJS,;t t
|
||||
s,@HAVE_IPV6@,$HAVE_IPV6,;t t
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# -*-makefile-*-
|
||||
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.197 2004/10/05 19:30:19 momjian Exp $
|
||||
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.198 2004/10/06 09:20:41 momjian Exp $
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# All PostgreSQL makefiles include this file and use the variables it sets,
|
||||
@ -137,6 +137,7 @@ enable_thread_safety = @enable_thread_safety@
|
||||
python_includespec = @python_includespec@
|
||||
python_libspec = @python_libspec@
|
||||
python_configdir = @python_configdir@
|
||||
python_version = @python_version@
|
||||
|
||||
krb_srvtab = @krb_srvtab@
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.14 2004/09/24 20:08:42 tgl Exp $
|
||||
# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.15 2004/10/06 09:20:41 momjian Exp $
|
||||
|
||||
subdir = src/pl/plpython
|
||||
top_builddir = ../../..
|
||||
@ -12,6 +12,12 @@ ifneq (,$(wildcard $(python_configdir)/libpython*$(DLSUFFIX)*))
|
||||
shared_libpython = yes
|
||||
endif
|
||||
|
||||
# Convert backslashed paths to normal slashes
|
||||
ifeq ($(PORTNAME), win32)
|
||||
shared_libpython = yes
|
||||
python_includespec := $(subst \,/,$(python_includespec))
|
||||
endif
|
||||
|
||||
# Darwin (OS X) has its own ideas about how to do this.
|
||||
ifeq ($(PORTNAME), darwin)
|
||||
shared_libpython = yes
|
||||
@ -30,6 +36,21 @@ SO_MAJOR_VERSION = 0
|
||||
SO_MINOR_VERSION = 0
|
||||
OBJS = plpython.o
|
||||
|
||||
|
||||
# Python on win32 ships with import libraries only for Microsoft Visual C++,
|
||||
# which are not compatible with mingw gcc. Therefore we need to build a
|
||||
# new import library to link with.
|
||||
ifeq ($(PORTNAME), win32)
|
||||
pytverstr=$(subst .,,${python_version})
|
||||
OBJS += libpython${pytverstr}.a
|
||||
libpython${pytverstr}.a: python${pytverstr}.def
|
||||
dlltool --dllname python${pytverstr}.dll --def python${pytverstr}.def --output-lib libpython${pytverstr}.a
|
||||
WD=$(subst \,/,$(WINDIR))
|
||||
python${pytverstr}.def: $(WD)/system32/python${pytverstr}.dll
|
||||
pexports $(WD)/system32/python${pytverstr}.dll > python${pytverstr}.def
|
||||
endif
|
||||
|
||||
|
||||
SHLIB_LINK = $(BE_DLLLIBS) $(python_libspec)
|
||||
|
||||
include $(top_srcdir)/src/Makefile.shlib
|
||||
@ -55,6 +76,9 @@ uninstall:
|
||||
clean distclean maintainer-clean: clean-lib
|
||||
rm -f $(OBJS)
|
||||
@rm -f error.diff feature.diff error.output feature.output test.log
|
||||
ifeq ($(PORTNAME), win32)
|
||||
rm -f python${pytverstr}.def
|
||||
endif
|
||||
|
||||
installcheck:
|
||||
PATH=$(bindir):$$PATH $(SHELL) $(srcdir)/test.sh
|
||||
|
||||
Loading…
Reference in New Issue
Block a user