diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2014-12-04 07:58:12 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2014-12-04 08:45:38 -0500 |
| commit | 4e4b9002498b72c7000a675216470e8918fc0420 (patch) | |
| tree | 40b42920fdb67e6ca4f52d2fad99b2bb0f93f7cf | |
| parent | 3e2dc9703a4835ace14310f82369df0a4e8528f2 (diff) | |
| download | postgresql-4e4b9002498b72c7000a675216470e8918fc0420.tar.gz postgresql-4e4b9002498b72c7000a675216470e8918fc0420.zip | |
Fix SHLIB_PREREQS use in contrib, allowing PGXS builds
dblink and postgres_fdw use SHLIB_PREREQS = submake-libpq to build libpq
first. This doesn't work in a PGXS build, because there is no libpq to
build. So just omit setting SHLIB_PREREQS in this case.
Note that PGXS users can still use SHLIB_PREREQS (although it is not
documented). The problem here is only that contrib modules can be built
in-tree or using PGXS, and the prerequisite is only applicable in the
former case.
Commit 6697aa2bc25c83b88d6165340348a31328c35de6 previously attempted to
address this by creating a somewhat fake submake-libpq target in
Makefile.global. That was not the right fix, and it was also done in a
nonportable way, so revert that.
| -rw-r--r-- | contrib/dblink/Makefile | 2 | ||||
| -rw-r--r-- | contrib/postgres_fdw/Makefile | 2 | ||||
| -rw-r--r-- | src/Makefile.global.in | 12 |
3 files changed, 3 insertions, 13 deletions
diff --git a/contrib/dblink/Makefile b/contrib/dblink/Makefile index 09032f89702..7cb023705ad 100644 --- a/contrib/dblink/Makefile +++ b/contrib/dblink/Makefile @@ -4,7 +4,6 @@ MODULE_big = dblink OBJS = dblink.o PG_CPPFLAGS = -I$(libpq_srcdir) SHLIB_LINK = $(libpq) -SHLIB_PREREQS = submake-libpq EXTENSION = dblink DATA = dblink--1.1.sql dblink--1.0--1.1.sql dblink--unpackaged--1.0.sql @@ -21,6 +20,7 @@ PG_CONFIG = pg_config PGXS := $(shell $(PG_CONFIG) --pgxs) include $(PGXS) else +SHLIB_PREREQS = submake-libpq subdir = contrib/dblink top_builddir = ../.. include $(top_builddir)/src/Makefile.global diff --git a/contrib/postgres_fdw/Makefile b/contrib/postgres_fdw/Makefile index 8c497201d0e..c0f4160f6ba 100644 --- a/contrib/postgres_fdw/Makefile +++ b/contrib/postgres_fdw/Makefile @@ -5,7 +5,6 @@ OBJS = postgres_fdw.o option.o deparse.o connection.o PG_CPPFLAGS = -I$(libpq_srcdir) SHLIB_LINK = $(libpq) -SHLIB_PREREQS = submake-libpq EXTENSION = postgres_fdw DATA = postgres_fdw--1.0.sql @@ -20,6 +19,7 @@ PG_CONFIG = pg_config PGXS := $(shell $(PG_CONFIG) --pgxs) include $(PGXS) else +SHLIB_PREREQS = submake-libpq subdir = contrib/postgres_fdw top_builddir = ../.. include $(top_builddir)/src/Makefile.global diff --git a/src/Makefile.global.in b/src/Makefile.global.in index aa54f94763e..d7a83c89a2d 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -456,23 +456,13 @@ ifeq ($(PORTNAME),cygwin) libpq_pgport += $(LDAP_LIBS_FE) endif -# If PGXS is not defined, build libpq and libpgport dependencies as required. -# If the build is with PGXS, then these are supposed to be already built and -# installed, and we just ensure that the expected files exist. -ifndef PGXS + submake-libpq: $(MAKE) -C $(libpq_builddir) all -else -submake-libpq: $(libdir)/libpq.so ; -endif -ifndef PGXS submake-libpgport: $(MAKE) -C $(top_builddir)/src/port all $(MAKE) -C $(top_builddir)/src/common all -else -submake-libpgport: $(libdir)/libpgport.a $(libdir)/libpgcommon.a ; -endif .PHONY: submake-libpq submake-libpgport |