mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-11-27 07:21:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few single-file (MODULES, not MODULE_big) contrib makefiles that were

Browse Source 
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.
This commit is contained in:
Tom Lane 2010-07-05 23:15:56 +00:00
parent 291a957745
commit f9e9da6664
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/earthdistance/Makefile
View File

@ -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 MODULES = earthdistance
DATA_built = earthdistance.sql DATA_built = earthdistance.sql
DATA = uninstall_earthdistance.sql DATA = uninstall_earthdistance.sql
REGRESS = earthdistance REGRESS = earthdistance
SHLIB_LINK += $(filter -lm, $(LIBS)) LDFLAGS_SL += $(filter -lm, $(LIBS))
ifdef USE_PGXS ifdef USE_PGXS
PG_CONFIG = pg_config PG_CONFIG = pg_config

6
contrib/spi/Makefile
View File

@ -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 MODULES = autoinc insert_username moddatetime refint timetravel
DATA_built = $(addsuffix .sql, $(MODULES)) 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 # comment out if you want a quieter refint package for other uses
PG_CPPFLAGS = -DREFINT_VERBOSE PG_CPPFLAGS = -DREFINT_VERBOSE
LDFLAGS_SL += -L$(top_builddir)/src/port -lpgport
ifdef USE_PGXS ifdef USE_PGXS
PG_CONFIG = pg_config PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs) PGXS := $(shell $(PG_CONFIG) --pgxs)
@ -18,5 +20,3 @@ top_builddir = ../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk include $(top_srcdir)/contrib/contrib-global.mk
endif endif
SHLIB_LINK += -L$(top_builddir)/src/port -lpgport

4
contrib/tablefunc/Makefile
View File

@ -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 MODULES = tablefunc
DATA_built = tablefunc.sql DATA_built = tablefunc.sql
DATA = uninstall_tablefunc.sql DATA = uninstall_tablefunc.sql
REGRESS = tablefunc REGRESS = tablefunc
SHLIB_LINK += $(filter -lm, $(LIBS)) LDFLAGS_SL += $(filter -lm, $(LIBS))
ifdef USE_PGXS ifdef USE_PGXS
PG_CONFIG = pg_config PG_CONFIG = pg_config

2
src/makefiles/Makefile.aix
View File

@ -39,4 +39,4 @@ MKLDEXPORT=$(top_srcdir)/src/backend/port/aix/mkldexport.sh
# Rule for building a shared library from a single .o file # Rule for building a shared library from a single .o file
%$(DLSUFFIX): %.o %.exp %$(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)

4
src/makefiles/Makefile.cygwin
View File

@ -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 DLLTOOL= dlltool
DLLWRAP= dllwrap DLLWRAP= dllwrap
ifdef PGXS ifdef PGXS
@ -41,5 +41,5 @@ endif
# Rule for building a shared library from a single .o file # Rule for building a shared library from a single .o file
%.dll: %.o %.dll: %.o
$(DLLTOOL) --export-all --output-def $*.def $< $(DLLTOOL) --export-all --output-def $*.def $<
$(DLLWRAP) -o $@ --def $*.def $< $(SHLIB_LINK) $(DLLWRAP) -o $@ --def $*.def $< $(LDFLAGS) $(LDFLAGS_SL) $(BE_DLLLIBS)
rm -f $*.def rm -f $*.def

2
src/makefiles/Makefile.darwin
View File

@ -10,4 +10,4 @@ endif
# Rule for building a shared library from a single .o file # Rule for building a shared library from a single .o file
%.so: %.o %.so: %.o
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -bundle -o $@ $< $(BE_DLLLIBS) $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -bundle $(BE_DLLLIBS) -o $@ $<

4
src/makefiles/Makefile.win32
View File

@ -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 # Use replacement include files for those missing on Win32
override CPPFLAGS+="-I$(top_srcdir)/src/include/port/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 # Rule for building a shared library from a single .o file
%.dll: %.o %.dll: %.o
$(DLLTOOL) --export-all --output-def $*.def $< $(DLLTOOL) --export-all --output-def $*.def $<
$(DLLWRAP) -o $@ --def $*.def $< $(SHLIB_LINK) $(DLLWRAP) -o $@ --def $*.def $< $(LDFLAGS) $(LDFLAGS_SL) $(BE_DLLLIBS)
rm -f $*.def rm -f $*.def