Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfc87450

Browse files
committed
PL/Python: Make build on OS X more flexible
The PL/Python build on OS X was previously hardcoded to use the systeminstallation of Python, ignoring whatever was specified to configure.Except that it would use the header files from configure, which couldlead to mismatches. It was not possible to build against a customPython installation.Now, we check in configure how the specified Python installation wasbuilt and use that, supporting framework and non-framework builds.
1 parent7e938e3 commitfc87450

File tree

4 files changed

+35
-19
lines changed

4 files changed

+35
-19
lines changed

‎config/python.m4

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ AC_MSG_RESULT([$python_includespec])
4848
4949
AC_SUBST(python_majorversion)[]dnl
5050
AC_SUBST(python_version)[]dnl
51-
AC_SUBST(python_configdir)[]dnl
5251
AC_SUBST(python_includespec)[]dnl
5352
])# _PGAC_CHECK_PYTHON_DIRS
5453

@@ -69,8 +68,14 @@ python_libdir=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(N
6968
python_ldlibrary=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDLIBRARY'))))"`
7069
python_so=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('SO'))))"`
7170
ldlibrary=`echo "${python_ldlibrary}" | sed "s/${python_so}$//"`
71+
python_framework=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('PYTHONFRAMEWORK'))))"`
72+
python_enable_shared=`${PYTHON} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_vars().get('Py_ENABLE_SHARED',0))"`
7273
73-
if test x"${python_libdir}" != x"" -a x"${python_ldlibrary}" != x"" -a x"${python_ldlibrary}" != x"${ldlibrary}"
74+
if test -n "$python_framework"; then
75+
python_frameworkprefix=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('PYTHONFRAMEWORKPREFIX'))))"`
76+
python_libspec="-F $python_frameworkprefix -framework $python_framework"
77+
python_enable_shared=1
78+
elif test x"${python_libdir}" != x"" -a x"${python_ldlibrary}" != x"" -a x"${python_ldlibrary}" != x"${ldlibrary}"
7479
then
7580
# New way: use the official shared library
7681
ldlibrary=`echo "${ldlibrary}" | sed "s/^lib//"`
@@ -86,13 +91,16 @@ else
8691
python_libspec="-L${python_libdir} -lpython${python_ldversion}"
8792
fi
8893
89-
python_additional_libs=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
94+
if test -z "$python_framework"; then
95+
python_additional_libs=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
96+
fi
9097
9198
AC_MSG_RESULT([${python_libspec} ${python_additional_libs}])
9299
93100
AC_SUBST(python_libdir)[]dnl
94101
AC_SUBST(python_libspec)[]dnl
95102
AC_SUBST(python_additional_libs)[]dnl
103+
AC_SUBST(python_enable_shared)[]dnl
96104
97105
# threaded python is not supported on OpenBSD
98106
AC_MSG_CHECKING(whetherPythoniscompiledwiththreadsupport)

‎configure

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -672,11 +672,11 @@ HAVE_IPV6
672672
LIBOBJS
673673
OSSP_UUID_LIBS
674674
ZIC
675+
python_enable_shared
675676
python_additional_libs
676677
python_libspec
677678
python_libdir
678679
python_includespec
679-
python_configdir
680680
python_version
681681
python_majorversion
682682
PYTHON
@@ -7446,8 +7446,14 @@ python_libdir=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(N
74467446
python_ldlibrary=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDLIBRARY'))))"`
74477447
python_so=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('SO'))))"`
74487448
ldlibrary=`echo "${python_ldlibrary}" | sed "s/${python_so}$//"`
7449-
7450-
if test x"${python_libdir}" != x"" -a x"${python_ldlibrary}" != x"" -a x"${python_ldlibrary}" != x"${ldlibrary}"
7449+
python_framework=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('PYTHONFRAMEWORK'))))"`
7450+
python_enable_shared=`${PYTHON} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_vars().get('Py_ENABLE_SHARED',0))"`
7451+
7452+
if test -n "$python_framework"; then
7453+
python_frameworkprefix=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('PYTHONFRAMEWORKPREFIX'))))"`
7454+
python_libspec="-F $python_frameworkprefix -framework $python_framework"
7455+
python_enable_shared=1
7456+
elif test x"${python_libdir}" != x"" -a x"${python_ldlibrary}" != x"" -a x"${python_ldlibrary}" != x"${ldlibrary}"
74517457
then
74527458
# New way: use the official shared library
74537459
ldlibrary=`echo "${ldlibrary}" | sed "s/^lib//"`
@@ -7463,7 +7469,9 @@ else
74637469
python_libspec="-L${python_libdir} -lpython${python_ldversion}"
74647470
fi
74657471

7466-
python_additional_libs=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
7472+
if test -z "$python_framework"; then
7473+
python_additional_libs=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
7474+
fi
74677475

74687476
{ $as_echo "$as_me:$LINENO: result: ${python_libspec} ${python_additional_libs}" >&5
74697477
$as_echo "${python_libspec} ${python_additional_libs}" >&6; }

‎src/Makefile.global.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,11 @@ enable_dtrace= @enable_dtrace@
175175
enable_coverage= @enable_coverage@
176176
enable_thread_safety= @enable_thread_safety@
177177

178+
python_enable_shared= @python_enable_shared@
178179
python_includespec= @python_includespec@
179180
python_libdir= @python_libdir@
180181
python_libspec= @python_libspec@
181182
python_additional_libs= @python_additional_libs@
182-
python_configdir= @python_configdir@
183183
python_majorversion= @python_majorversion@
184184
python_version= @python_version@
185185

‎src/pl/plpython/Makefile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,20 @@ top_builddir = ../../..
55
include$(top_builddir)/src/Makefile.global
66

77

8-
# On some platforms we can only build PL/Python if libpython is a
9-
# shared library. Since there is no official way to determine this
10-
# (at least not in pre-2.3 Python), we see if there is a file that is
11-
# named like a shared library.
8+
# We need libpython as a shared library. In Python >=2.5, configure
9+
# asks Python directly. But because this has been broken in Debian
10+
# for a long time (http://bugs.debian.org/695979), and to support
11+
# older Python versions, we see if there is a file that is named like
12+
# a shared library as a fallback. (Note that this is wrong on OS X,
13+
# where DLSUFFIX is .so, but libpython is a .dylib. Python <2.5 is
14+
# therefore not supported on OS X.)
15+
ifeq (1,$(python_enable_shared))
16+
shared_libpython = yes
17+
else
1218
ifneq (,$(wildcard$(python_libdir)/libpython*$(DLSUFFIX)*))
1319
shared_libpython = yes
1420
endif
21+
endif
1522

1623
# Windows needs to convert backslashed paths to normal slashes,
1724
# and we have to remove -lpython from the link since we are building our own
@@ -21,13 +28,6 @@ python_includespec := $(subst \,/,$(python_includespec))
2128
overridepython_libspec =
2229
endif
2330

24-
# Darwin (OS X) has its own ideas about how to do this.
25-
ifeq ($(PORTNAME), darwin)
26-
shared_libpython = yes
27-
overridepython_libspec = -framework Python
28-
overridepython_additional_libs =
29-
endif
30-
3131
# If we don't have a shared library, we have to skip it.
3232
ifeq ($(shared_libpython),yes)
3333

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp