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

Commitd664a10

Browse files
committed
Move interpreter shared library detection to configure
For building PL/Perl, PL/Python, and PL/Tcl, we need a shared library oflibperl, libpython, and libtcl, respectively. Previously, this waschecked in the makefiles, skipping the PL build with a warning if noshared library was available. Now this is checked in configure, with anerror if no shared library is available.The previous situation arose because in the olden days, the configureoptions --with-perl, --with-python, and --with-tcl controlled whetherfrontend interfaces for those languages would be built. The procedurallanguages were added later, and shared libraries were often notavailable in the beginning. So it was decided skip the builds of theprocedural languages in those cases. The frontend interfaces have sincebeen removed from the tree, and shared libraries are now available mostof the time, so that setup makes much less sense now.Also, the new setup allows contrib modules and pgxs users to rely on therespective PLs being available based on configure flags.
1 parent77477e7 commitd664a10

File tree

7 files changed

+74
-88
lines changed

7 files changed

+74
-88
lines changed

‎config/python.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ AC_MSG_RESULT([${python_libspec} ${python_additional_libs}])
9393
AC_SUBST(python_libdir)[]dnl
9494
AC_SUBST(python_libspec)[]dnl
9595
AC_SUBST(python_additional_libs)[]dnl
96-
AC_SUBST(python_enable_shared)[]dnl
9796
9897
# threaded python is not supported on OpenBSD
9998
AC_MSG_CHECKING(whetherPythoniscompiledwiththreadsupport)

‎configure

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,6 @@ TCL_SHLIB_LD_LIBS
641641
TCL_SHARED_BUILD
642642
TCL_LIB_SPEC
643643
TCL_LIBS
644-
TCL_LIB_FILE
645644
TCL_INCLUDE_SPEC
646645
TCL_CONFIG_SH
647646
TCLSH
@@ -662,7 +661,6 @@ HAVE_IPV6
662661
LIBOBJS
663662
UUID_LIBS
664663
ZIC
665-
python_enable_shared
666664
python_additional_libs
667665
python_libspec
668666
python_libdir
@@ -7384,6 +7382,12 @@ perl_useshrplib=`$PERL -MConfig -e 'print $Config{useshrplib}'`
73847382
test"$PORTNAME" ="win32"&& perl_useshrplib=`echo$perl_useshrplib| sed's,\\\\,/,g'`
73857383
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$perl_useshrplib">&5
73867384
$as_echo"$perl_useshrplib">&6; }
7385+
iftest"$perl_useshrplib"!= yes&&test"$perl_useshrplib"!=true;then
7386+
as_fn_error$?"cannot build PL/Perl because libperl is not a shared library
7387+
You might have to rebuild your Perl installation. Refer to the
7388+
documentation for details. Use --without-perl to disable building
7389+
PL/Perl.""$LINENO" 5
7390+
fi
73877391

73887392
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for flags to link embedded Perl">&5
73897393
$as_echo_n"checking for flags to link embedded Perl...">&6; }
@@ -7537,6 +7541,32 @@ $as_echo "no" >&6; }
75377541
fi
75387542

75397543

7544+
7545+
# We need libpython as a shared library. With Python >=2.5, we check
7546+
# the Py_ENABLE_SHARED setting. OS X does supply a .dylib even
7547+
# though Py_ENABLE_SHARED does not get set. On Debian, the setting
7548+
# is not correct before the jessie release
7549+
# (http://bugs.debian.org/695979). We also want to support older
7550+
# Python versions. So as a fallback we see if there is a file that
7551+
# is named like a shared library.
7552+
7553+
iftest"$python_enable_shared"!= 1;then
7554+
# We don't know the platform shared library extension here yet, so
7555+
# we try some candidates.
7556+
fordlsuffixin .so .dll .dylib .sl;do
7557+
if ls"$python_libdir"/libpython*${dlsuffix}*>/dev/null2>&1;then
7558+
python_enable_shared=1
7559+
break
7560+
fi
7561+
done
7562+
fi
7563+
7564+
iftest"$python_enable_shared"!= 1;then
7565+
as_fn_error$?"cannot build PL/Python because libpython is not a shared library
7566+
You might have to rebuild your Python installation. Refer to the
7567+
documentation for details. Use --without-python to disable building
7568+
PL/Python.""$LINENO" 5
7569+
fi
75407570
fi
75417571

75427572
iftest"$cross_compiling" = yes&&test -z"$with_system_tzdata";then
@@ -14736,12 +14766,15 @@ fi
1473614766

1473714767
."$TCL_CONFIG_SH"
1473814768
eval TCL_INCLUDE_SPEC=\"$TCL_INCLUDE_SPEC\"
14739-
eval TCL_LIB_FILE=\"$TCL_LIB_FILE\"
1474014769
eval TCL_LIBS=\"$TCL_LIBS\"
1474114770
eval TCL_LIB_SPEC=\"$TCL_LIB_SPEC\"
1474214771
eval TCL_SHARED_BUILD=\"$TCL_SHARED_BUILD\"
1474314772

14744-
# now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
14773+
iftest"$TCL_SHARED_BUILD"!= 1;then
14774+
as_fn_error$?"cannot build PL/Tcl because Tcl is not a shared library
14775+
Use --without-tcl to disable building PL/Tcl.""$LINENO" 5
14776+
fi
14777+
# now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
1474514778
ac_save_CPPFLAGS=$CPPFLAGS
1474614779
CPPFLAGS="$TCL_INCLUDE_SPEC$CPPFLAGS"
1474714780
ac_fn_c_check_header_mongrel"$LINENO""tcl.h""ac_cv_header_tcl_h""$ac_includes_default"

‎configure.in

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,12 +889,44 @@ if test "$with_perl" = yes; then
889889
AC_MSG_ERROR([Perl not found])
890890
fi
891891
PGAC_CHECK_PERL_CONFIGS([archlibexp,privlibexp,useshrplib])
892+
if test "$perl_useshrplib" != yes && test "$perl_useshrplib" != true; then
893+
AC_MSG_ERROR([cannot build PL/Perl because libperl is not a shared library
894+
You might have to rebuild your Perl installation. Refer to the
895+
documentation for details. Use --without-perl to disable building
896+
PL/Perl.])
897+
fi
892898
PGAC_CHECK_PERL_EMBED_LDFLAGS
893899
fi
894900

895901
if test "$with_python" = yes; then
896902
PGAC_PATH_PYTHON
897903
PGAC_CHECK_PYTHON_EMBED_SETUP
904+
905+
# We need libpython as a shared library. With Python >=2.5, we check
906+
# the Py_ENABLE_SHARED setting. OS X does supply a .dylib even
907+
# though Py_ENABLE_SHARED does not get set. On Debian, the setting
908+
# is not correct before the jessie release
909+
# (http://bugs.debian.org/695979). We also want to support older
910+
# Python versions. So as a fallback we see if there is a file that
911+
# is named like a shared library.
912+
913+
if test "$python_enable_shared" != 1; then
914+
# We don't know the platform shared library extension here yet, so
915+
# we try some candidates.
916+
for dlsuffix in .so .dll .dylib .sl; do
917+
if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
918+
python_enable_shared=1
919+
break
920+
fi
921+
done
922+
fi
923+
924+
if test "$python_enable_shared" != 1; then
925+
AC_MSG_ERROR([cannot build PL/Python because libpython is not a shared library
926+
You might have to rebuild your Python installation. Refer to the
927+
documentation for details. Use --without-python to disable building
928+
PL/Python.])
929+
fi
898930
fi
899931

900932
if test "$cross_compiling" = yes && test -z "$with_system_tzdata"; then
@@ -1942,8 +1974,12 @@ fi
19421974
if test "$with_tcl" = yes; then
19431975
PGAC_PATH_TCLCONFIGSH([$with_tclconfig])
19441976
PGAC_EVAL_TCLCONFIGSH([$TCL_CONFIG_SH],
1945-
[TCL_INCLUDE_SPEC,TCL_LIB_FILE,TCL_LIBS,TCL_LIB_SPEC,TCL_SHARED_BUILD])
1977+
[TCL_INCLUDE_SPEC,TCL_LIBS,TCL_LIB_SPEC,TCL_SHARED_BUILD])
19461978
AC_SUBST(TCL_SHLIB_LD_LIBS)dnl don't want to double-evaluate that one
1979+
if test "$TCL_SHARED_BUILD" != 1; then
1980+
AC_MSG_ERROR([cannot build PL/Tcl because Tcl is not a shared library
1981+
Use --without-tcl to disable building PL/Tcl.])
1982+
fi
19471983
# now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
19481984
ac_save_CPPFLAGS=$CPPFLAGS
19491985
CPPFLAGS="$TCL_INCLUDE_SPEC $CPPFLAGS"

‎src/Makefile.global.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ enable_coverage= @enable_coverage@
181181
enable_tap_tests= @enable_tap_tests@
182182
enable_thread_safety= @enable_thread_safety@
183183

184-
python_enable_shared= @python_enable_shared@
185184
python_includespec= @python_includespec@
186185
python_libdir= @python_libdir@
187186
python_libspec= @python_libspec@
@@ -192,7 +191,6 @@ python_version= @python_version@
192191
krb_srvtab = @krb_srvtab@
193192

194193
TCLSH= @TCLSH@
195-
TCL_LIB_FILE= @TCL_LIB_FILE@
196194
TCL_LIBS= @TCL_LIBS@
197195
TCL_LIB_SPEC= @TCL_LIB_SPEC@
198196
TCL_INCLUDE_SPEC= @TCL_INCLUDE_SPEC@
@@ -283,7 +281,6 @@ else
283281
endif
284282
perl_archlibexp= @perl_archlibexp@
285283
perl_privlibexp= @perl_privlibexp@
286-
perl_useshrplib= @perl_useshrplib@
287284
perl_embed_ldflags= @perl_embed_ldflags@
288285

289286
# Miscellaneous

‎src/pl/plperl/GNUmakefile

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,6 @@ subdir = src/pl/plperl
55
top_builddir = ../../..
66
include$(top_builddir)/src/Makefile.global
77

8-
ifeq ($(perl_useshrplib),true)
9-
shared_libperl = yes
10-
endif
11-
ifeq ($(perl_useshrplib),yes)
12-
shared_libperl = yes
13-
endif
14-
15-
# If we don't have a shared library, we have to skip it.
16-
ifeq ($(shared_libperl),yes)
17-
188
ifeq ($(PORTNAME), win32)
199
overrideCPPFLAGS += -DPLPERL_HAVE_UID_GID
2010
# Perl on win32 contains /* within comment all over the header file,
@@ -130,14 +120,3 @@ clean distclean maintainer-clean: clean-lib
130120
ifeq ($(PORTNAME), win32)
131121
rm -f $(perlwithver).def
132122
endif
133-
134-
else# can't build
135-
136-
all:
137-
@echo"";\
138-
echo"*** Cannot build PL/Perl because libperl is not a shared library.";\
139-
echo"*** You might have to rebuild your Perl installation. Refer to";\
140-
echo"*** the documentation for details.";\
141-
echo""
142-
143-
endif# can't build

‎src/pl/plpython/Makefile

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

77

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.
13-
ifeq (1,$(python_enable_shared))
14-
shared_libpython = yes
15-
else
16-
ifeq ($(PORTNAME), darwin)
17-
# OS X does supply a .dylib even though Py_ENABLE_SHARED does not get set
18-
shared_libpython = yes
19-
else
20-
ifneq (,$(wildcard$(python_libdir)/libpython*$(DLSUFFIX)*))
21-
shared_libpython = yes
22-
endif
23-
endif
24-
endif
25-
268
# Windows needs to convert backslashed paths to normal slashes,
279
# and we have to remove -lpython from the link since we are building our own
2810
ifeq ($(PORTNAME), win32)
@@ -31,8 +13,6 @@ python_includespec := $(subst \,/,$(python_includespec))
3113
overridepython_libspec =
3214
endif
3315

34-
# If we don't have a shared library, we have to skip it.
35-
ifeq ($(shared_libpython),yes)
3616

3717
overrideCPPFLAGS := -I. -I$(srcdir)$(python_includespec)$(CPPFLAGS)
3818

@@ -159,18 +139,6 @@ ifeq ($(PORTNAME), win32)
159139
rm -f python${pytverstr}.def
160140
endif
161141

162-
else # can't build
163-
164-
all:
165-
@echo"";\
166-
echo"*** Cannot build PL/Python because libpython is not a shared library.";\
167-
echo"*** You might have to rebuild your Python installation. Refer to";\
168-
echo"*** the documentation for details.";\
169-
echo""
170-
171-
endif# can't build
172-
173-
# distprep and maintainer-clean rules should be run even if we can't build.
174142

175143
# Force this dependency to be known even without dependency info built:
176144
plpy_plpymodule.o: spiexceptions.h

‎src/pl/tcl/Makefile

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,6 @@ include $(top_builddir)/src/Makefile.global
1414
overrideCPPFLAGS :=$(TCL_INCLUDE_SPEC)$(CPPFLAGS)
1515

1616

17-
# Find out whether Tcl was built as a shared library --- if not, we
18-
# can't link a shared library that depends on it, and have to forget
19-
# about building pltcl. In Tcl 8, tclConfig.sh sets TCL_SHARED_BUILD
20-
# for us, but in older Tcl releases it doesn't. In that case we guess
21-
# based on the name of the Tcl library.
22-
23-
ifndefTCL_SHARED_BUILD
24-
ifneq (,$(findstring$(DLSUFFIX),$(TCL_LIB_FILE)))
25-
TCL_SHARED_BUILD=1
26-
else
27-
TCL_SHARED_BUILD=0
28-
endif
29-
endif
30-
31-
3217
# On Windows, we don't link directly with the Tcl library; see below
3318
ifneq ($(PORTNAME), win32)
3419
SHLIB_LINK =$(TCL_LIB_SPEC)$(TCL_LIBS) -lc
@@ -67,7 +52,6 @@ endif # win32
6752

6853
include$(top_srcdir)/src/Makefile.shlib
6954

70-
ifeq ($(TCL_SHARED_BUILD), 1)
7155

7256
all: all-lib
7357
$(MAKE) -C modules$@
@@ -102,16 +86,6 @@ installcheck: submake
10286
submake:
10387
$(MAKE) -C$(top_builddir)/src/test/regress pg_regress$(X)
10488

105-
else # TCL_SHARED_BUILD = 0
106-
107-
# Provide dummy targets for the case where we can't build the shared library.
108-
all:
109-
@echo"*****";\
110-
echo"* Cannot build PL/Tcl because Tcl is not a shared library; skipping it.";\
111-
echo"*****"
112-
113-
endif# TCL_SHARED_BUILD = 0
114-
11589
cleandistcleanmaintainer-clean: clean-lib
11690
rm -f$(OBJS)
11791
rm -rf$(pg_regress_clean_files)

0 commit comments

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