Skip to content

Commit f9e9da6

Browse files
tglsfdctglsfdc
committed
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.
1 parent 291a957 commit f9e9da6

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

‎contrib/earthdistance/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# $PostgreSQL: pgsql/contrib/earthdistance/Makefile,v 1.19 2007/11/10 23:59:50 momjian Exp $
1+
# $PostgreSQL: pgsql/contrib/earthdistance/Makefile,v 1.20 2010/07/05 23:15:55 tgl Exp $
22

33
MODULES = earthdistance
44
DATA_built = earthdistance.sql
55
DATA = uninstall_earthdistance.sql
66
REGRESS = earthdistance
77

8-
SHLIB_LINK += $(filter -lm, $(LIBS))
8+
LDFLAGS_SL += $(filter -lm, $(LIBS))
99

1010
ifdef USE_PGXS
1111
PG_CONFIG = pg_config

‎contrib/spi/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/contrib/spi/Makefile,v 1.28 2007/12/03 04:22:54 tgl Exp $
1+
# $PostgreSQL: pgsql/contrib/spi/Makefile,v 1.29 2010/07/05 23:15:56 tgl Exp $
22

33
MODULES = autoinc insert_username moddatetime refint timetravel
44
DATA_built = $(addsuffix .sql, $(MODULES))
@@ -8,6 +8,8 @@ DOCS = $(addsuffix .example, $(MODULES))
88
# comment out if you want a quieter refint package for other uses
99
PG_CPPFLAGS = -DREFINT_VERBOSE
1010

11+
LDFLAGS_SL += -L$(top_builddir)/src/port -lpgport
12+
1113
ifdef USE_PGXS
1214
PG_CONFIG = pg_config
1315
PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -18,5 +20,3 @@ top_builddir = ../..
1820
include $(top_builddir)/src/Makefile.global
1921
include $(top_srcdir)/contrib/contrib-global.mk
2022
endif
21-
22-
SHLIB_LINK += -L$(top_builddir)/src/port -lpgport

‎contrib/tablefunc/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# $PostgreSQL: pgsql/contrib/tablefunc/Makefile,v 1.9 2007/11/10 23:59:51 momjian Exp $
1+
# $PostgreSQL: pgsql/contrib/tablefunc/Makefile,v 1.10 2010/07/05 23:15:56 tgl Exp $
22

33
MODULES = tablefunc
44
DATA_built = tablefunc.sql
55
DATA = uninstall_tablefunc.sql
66
REGRESS = tablefunc
77

8-
SHLIB_LINK += $(filter -lm, $(LIBS))
8+
LDFLAGS_SL += $(filter -lm, $(LIBS))
99

1010
ifdef USE_PGXS
1111
PG_CONFIG = pg_config

‎src/makefiles/Makefile.aix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ MKLDEXPORT=$(top_srcdir)/src/backend/port/aix/mkldexport.sh
3939

4040
# Rule for building a shared library from a single .o file
4141
%$(DLSUFFIX): %.o %.exp
42-
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bE:$*.exp $(SHLIB_LINK)
42+
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bE:$*.exp $(BE_DLLLIBS)

‎src/makefiles/Makefile.cygwin

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.14 2010/07/05 18:54:38 tgl Exp $
1+
# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.15 2010/07/05 23:15:56 tgl Exp $
22
DLLTOOL= dlltool
33
DLLWRAP= dllwrap
44
ifdef PGXS
@@ -41,5 +41,5 @@ endif
4141
# Rule for building a shared library from a single .o file
4242
%.dll: %.o
4343
$(DLLTOOL) --export-all --output-def $*.def $<
44-
$(DLLWRAP) -o $@ --def $*.def $< $(SHLIB_LINK)
44+
$(DLLWRAP) -o $@ --def $*.def $< $(LDFLAGS) $(LDFLAGS_SL) $(BE_DLLLIBS)
4545
rm -f $*.def

‎src/makefiles/Makefile.darwin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ endif
1010

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

‎src/makefiles/Makefile.win32

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.16 2010/07/05 18:54:38 tgl Exp $
1+
# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.17 2010/07/05 23:15:56 tgl Exp $
22

33
# Use replacement include files for those missing on Win32
44
override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
@@ -69,5 +69,5 @@ win32ver.o: win32ver.rc
6969
# Rule for building a shared library from a single .o file
7070
%.dll: %.o
7171
$(DLLTOOL) --export-all --output-def $*.def $<
72-
$(DLLWRAP) -o $@ --def $*.def $< $(SHLIB_LINK)
72+
$(DLLWRAP) -o $@ --def $*.def $< $(LDFLAGS) $(LDFLAGS_SL) $(BE_DLLLIBS)
7373
rm -f $*.def

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy