From: Tom Lane Date: Mon, 5 Jul 2010 23:15:56 +0000 (+0000) Subject: Fix a few single-file (MODULES, not MODULE_big) contrib makefiles that were X-Git-Tag: REL9_0_BETA3~27 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9e9da666423f38d9c0f97277cf4e21973608baf;p=postgresql Fix a few single-file (MODULES, not MODULE_big) contrib makefiles that were supposing that they should set SHLIB_LINK rather than LDFLAGS_SL. Since these don't go through Makefile.shlib that was a no-op on most platforms. Also regularize the few platform-specific Makefiles that did pay attention to SHLIB_LINK: it seems that the real value of that is to pull in BE_DLLLIBS, so do that instead. Per buildfarm failures on cygwin. --- diff --git a/contrib/earthdistance/Makefile b/contrib/earthdistance/Makefile index 64cc40fedc..ab72ac7fc9 100644 --- a/contrib/earthdistance/Makefile +++ b/contrib/earthdistance/Makefile @@ -1,11 +1,11 @@ -# $PostgreSQL: pgsql/contrib/earthdistance/Makefile,v 1.19 2007/11/10 23:59:50 momjian Exp $ +# $PostgreSQL: pgsql/contrib/earthdistance/Makefile,v 1.20 2010/07/05 23:15:55 tgl Exp $ MODULES = earthdistance DATA_built = earthdistance.sql DATA = uninstall_earthdistance.sql REGRESS = earthdistance -SHLIB_LINK += $(filter -lm, $(LIBS)) +LDFLAGS_SL += $(filter -lm, $(LIBS)) ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile index ed7d551c70..7a078a9b0e 100644 --- a/contrib/spi/Makefile +++ b/contrib/spi/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/spi/Makefile,v 1.28 2007/12/03 04:22:54 tgl Exp $ +# $PostgreSQL: pgsql/contrib/spi/Makefile,v 1.29 2010/07/05 23:15:56 tgl Exp $ MODULES = autoinc insert_username moddatetime refint timetravel DATA_built = $(addsuffix .sql, $(MODULES)) @@ -8,6 +8,8 @@ DOCS = $(addsuffix .example, $(MODULES)) # comment out if you want a quieter refint package for other uses PG_CPPFLAGS = -DREFINT_VERBOSE +LDFLAGS_SL += -L$(top_builddir)/src/port -lpgport + ifdef USE_PGXS PG_CONFIG = pg_config PGXS := $(shell $(PG_CONFIG) --pgxs) @@ -18,5 +20,3 @@ top_builddir = ../.. include $(top_builddir)/src/Makefile.global include $(top_srcdir)/contrib/contrib-global.mk endif - -SHLIB_LINK += -L$(top_builddir)/src/port -lpgport diff --git a/contrib/tablefunc/Makefile b/contrib/tablefunc/Makefile index 94aa740d18..1207c62ef7 100644 --- a/contrib/tablefunc/Makefile +++ b/contrib/tablefunc/Makefile @@ -1,11 +1,11 @@ -# $PostgreSQL: pgsql/contrib/tablefunc/Makefile,v 1.9 2007/11/10 23:59:51 momjian Exp $ +# $PostgreSQL: pgsql/contrib/tablefunc/Makefile,v 1.10 2010/07/05 23:15:56 tgl Exp $ MODULES = tablefunc DATA_built = tablefunc.sql DATA = uninstall_tablefunc.sql REGRESS = tablefunc -SHLIB_LINK += $(filter -lm, $(LIBS)) +LDFLAGS_SL += $(filter -lm, $(LIBS)) ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix index 6f5715db15..1ea7afc28d 100644 --- a/src/makefiles/Makefile.aix +++ b/src/makefiles/Makefile.aix @@ -39,4 +39,4 @@ MKLDEXPORT=$(top_srcdir)/src/backend/port/aix/mkldexport.sh # Rule for building a shared library from a single .o file %$(DLSUFFIX): %.o %.exp - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bE:$*.exp $(SHLIB_LINK) + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bE:$*.exp $(BE_DLLLIBS) diff --git a/src/makefiles/Makefile.cygwin b/src/makefiles/Makefile.cygwin index 2c0f87cd53..1a5bdc85cd 100644 --- a/src/makefiles/Makefile.cygwin +++ b/src/makefiles/Makefile.cygwin @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.14 2010/07/05 18:54:38 tgl Exp $ +# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.15 2010/07/05 23:15:56 tgl Exp $ DLLTOOL= dlltool DLLWRAP= dllwrap ifdef PGXS @@ -41,5 +41,5 @@ endif # Rule for building a shared library from a single .o file %.dll: %.o $(DLLTOOL) --export-all --output-def $*.def $< - $(DLLWRAP) -o $@ --def $*.def $< $(SHLIB_LINK) + $(DLLWRAP) -o $@ --def $*.def $< $(LDFLAGS) $(LDFLAGS_SL) $(BE_DLLLIBS) rm -f $*.def diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin index 2f6743ab14..4fa4954b36 100644 --- a/src/makefiles/Makefile.darwin +++ b/src/makefiles/Makefile.darwin @@ -10,4 +10,4 @@ endif # Rule for building a shared library from a single .o file %.so: %.o - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -bundle -o $@ $< $(BE_DLLLIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -bundle $(BE_DLLLIBS) -o $@ $< diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32 index 09aa523ba6..e6466304d4 100644 --- a/src/makefiles/Makefile.win32 +++ b/src/makefiles/Makefile.win32 @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.16 2010/07/05 18:54:38 tgl Exp $ +# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.17 2010/07/05 23:15:56 tgl Exp $ # Use replacement include files for those missing on Win32 override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32" @@ -69,5 +69,5 @@ win32ver.o: win32ver.rc # Rule for building a shared library from a single .o file %.dll: %.o $(DLLTOOL) --export-all --output-def $*.def $< - $(DLLWRAP) -o $@ --def $*.def $< $(SHLIB_LINK) + $(DLLWRAP) -o $@ --def $*.def $< $(LDFLAGS) $(LDFLAGS_SL) $(BE_DLLLIBS) rm -f $*.def