diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 3 | ||||
| -rw-r--r-- | src/pl/plperl/GNUmakefile | 21 | ||||
| -rw-r--r-- | src/pl/plpython/Makefile | 32 | ||||
| -rw-r--r-- | src/pl/tcl/Makefile | 26 |
4 files changed, 0 insertions, 82 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index a0fe8e43eb9..f8b7b3541d3 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -181,7 +181,6 @@ enable_coverage = @enable_coverage@ enable_tap_tests = @enable_tap_tests@ enable_thread_safety = @enable_thread_safety@ -python_enable_shared = @python_enable_shared@ python_includespec = @python_includespec@ python_libdir = @python_libdir@ python_libspec = @python_libspec@ @@ -192,7 +191,6 @@ python_version = @python_version@ krb_srvtab = @krb_srvtab@ TCLSH = @TCLSH@ -TCL_LIB_FILE = @TCL_LIB_FILE@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_SPEC = @TCL_LIB_SPEC@ TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@ @@ -283,7 +281,6 @@ else endif perl_archlibexp = @perl_archlibexp@ perl_privlibexp = @perl_privlibexp@ -perl_useshrplib = @perl_useshrplib@ perl_embed_ldflags = @perl_embed_ldflags@ # Miscellaneous diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile index 904a320cf6a..6e1377b53de 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -5,16 +5,6 @@ subdir = src/pl/plperl top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -ifeq ($(perl_useshrplib),true) -shared_libperl = yes -endif -ifeq ($(perl_useshrplib),yes) -shared_libperl = yes -endif - -# If we don't have a shared library, we have to skip it. -ifeq ($(shared_libperl),yes) - ifeq ($(PORTNAME), win32) override CPPFLAGS += -DPLPERL_HAVE_UID_GID # Perl on win32 contains /* within comment all over the header file, @@ -130,14 +120,3 @@ clean distclean maintainer-clean: clean-lib ifeq ($(PORTNAME), win32) rm -f $(perlwithver).def endif - -else # can't build - -all: - @echo ""; \ - echo "*** Cannot build PL/Perl because libperl is not a shared library."; \ - echo "*** You might have to rebuild your Perl installation. Refer to"; \ - echo "*** the documentation for details."; \ - echo "" - -endif # can't build diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile index de97cbb780b..8b1d8908e68 100644 --- a/src/pl/plpython/Makefile +++ b/src/pl/plpython/Makefile @@ -5,24 +5,6 @@ top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -# We need libpython as a shared library. In Python >=2.5, configure -# asks Python directly. But because this has been broken in Debian -# for a long time (http://bugs.debian.org/695979), and to support -# older Python versions, we see if there is a file that is named like -# a shared library as a fallback. -ifeq (1,$(python_enable_shared)) -shared_libpython = yes -else -ifeq ($(PORTNAME), darwin) -# OS X does supply a .dylib even though Py_ENABLE_SHARED does not get set -shared_libpython = yes -else -ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*)) -shared_libpython = yes -endif -endif -endif - # Windows needs to convert backslashed paths to normal slashes, # and we have to remove -lpython from the link since we are building our own ifeq ($(PORTNAME), win32) @@ -31,8 +13,6 @@ python_includespec := $(subst \,/,$(python_includespec)) override python_libspec = endif -# If we don't have a shared library, we have to skip it. -ifeq ($(shared_libpython),yes) override CPPFLAGS := -I. -I$(srcdir) $(python_includespec) $(CPPFLAGS) @@ -159,18 +139,6 @@ ifeq ($(PORTNAME), win32) rm -f python${pytverstr}.def endif -else # can't build - -all: - @echo ""; \ - echo "*** Cannot build PL/Python because libpython is not a shared library." ; \ - echo "*** You might have to rebuild your Python installation. Refer to"; \ - echo "*** the documentation for details."; \ - echo "" - -endif # can't build - -# distprep and maintainer-clean rules should be run even if we can't build. # Force this dependency to be known even without dependency info built: plpy_plpymodule.o: spiexceptions.h diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index 533d3b4efd0..24803de7908 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -14,21 +14,6 @@ include $(top_builddir)/src/Makefile.global override CPPFLAGS := $(TCL_INCLUDE_SPEC) $(CPPFLAGS) -# Find out whether Tcl was built as a shared library --- if not, we -# can't link a shared library that depends on it, and have to forget -# about building pltcl. In Tcl 8, tclConfig.sh sets TCL_SHARED_BUILD -# for us, but in older Tcl releases it doesn't. In that case we guess -# based on the name of the Tcl library. - -ifndef TCL_SHARED_BUILD -ifneq (,$(findstring $(DLSUFFIX),$(TCL_LIB_FILE))) -TCL_SHARED_BUILD=1 -else -TCL_SHARED_BUILD=0 -endif -endif - - # On Windows, we don't link directly with the Tcl library; see below ifneq ($(PORTNAME), win32) SHLIB_LINK = $(TCL_LIB_SPEC) $(TCL_LIBS) -lc @@ -67,7 +52,6 @@ endif # win32 include $(top_srcdir)/src/Makefile.shlib -ifeq ($(TCL_SHARED_BUILD), 1) all: all-lib $(MAKE) -C modules $@ @@ -102,16 +86,6 @@ installcheck: submake submake: $(MAKE) -C $(top_builddir)/src/test/regress pg_regress$(X) -else # TCL_SHARED_BUILD = 0 - -# Provide dummy targets for the case where we can't build the shared library. -all: - @echo "*****"; \ - echo "* Cannot build PL/Tcl because Tcl is not a shared library; skipping it."; \ - echo "*****" - -endif # TCL_SHARED_BUILD = 0 - clean distclean maintainer-clean: clean-lib rm -f $(OBJS) rm -rf $(pg_regress_clean_files) |