Skip to content

Commit 9df3086

Browse files
tglsfdctglsfdc
committed
Cause libpq and ecpg libraries to be built as proper shared libraries
(.dylib format) on Mac OS X, while not messing up loadable modules for the backend (which are the same kind of animal as a shared library on every other platform, but not here). Also get the naming convention to match OS X practice, viz libFOO.version.so not libFOO.so.version. In support of that last, refactor code in Makefile.shlib to make it easier to have platform-specific shlib naming conventions. This patch is loosely based on the Fink project's current postgresql.patch. Tested by yours truly on OS X 10.3.4; does anyone have 10.2.* to check it on?
1 parent 8b6f76a commit 9df3086

File tree

5 files changed

+71
-61
lines changed

5 files changed

+71
-61
lines changed

‎src/Makefile.shlib‎

Lines changed: 61 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1998, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.76 2004/05/19 21:37:43 momjian Exp $
9+
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.77 2004/07/13 00:06:46 tgl Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -71,8 +71,14 @@ LINK.static = $(AR) $(AROPT)
7171

7272
ifeq ($(enable_shared), yes)
7373

74+
# Default shlib naming convention used by the majority of platforms
75+
shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
76+
shlib_major = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
77+
shlib_bare = lib$(NAME)$(DLSUFFIX)
78+
7479
# For each platform we support shared libraries on, set shlib to the
75-
# name of the library, LINK.shared to the command to link the library,
80+
# name of the library (if default above is not right), set
81+
# LINK.shared to the command to link the library,
7682
# and adjust SHLIB_LINK if necessary.
7783

7884
# Try to keep the sections in some kind of order, folks...
@@ -82,17 +88,28 @@ override CFLAGS += $(CFLAGS_SL)
8288
soname = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
8389

8490
ifeq ($(PORTNAME), aix)
85-
shlib := lib$(NAME)$(DLSUFFIX)
91+
shlib = lib$(NAME)$(DLSUFFIX)
8692
# SHLIB_LINK += -lc
8793
endif
8894

8995
ifeq ($(PORTNAME), darwin)
90-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
91-
LINK.shared = $(COMPILER) -bundle
96+
ifneq ($(SO_MAJOR_VERSION), 0)
97+
version_link := -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
98+
endif
99+
ifeq ($(DLTYPE), library)
100+
# linkable library
101+
DLSUFFIX := .dylib
102+
LINK.shared = $(COMPILER) -dynamiclib -install_name $(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) $(version_link) -multiply_defined suppress
103+
else
104+
# loadable module (default case)
105+
DLSUFFIX := .so
106+
LINK.shared = $(COMPILER) -bundle
107+
endif
108+
shlib = lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
109+
shlib_major = lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
92110
endif
93111

94112
ifeq ($(PORTNAME), openbsd)
95-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
96113
ifdef ELF_SYSTEM
97114
LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname)
98115
SHLIB_LINK += -lc
@@ -102,7 +119,6 @@ ifeq ($(PORTNAME), openbsd)
102119
endif
103120

104121
ifeq ($(PORTNAME), bsdi)
105-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
106122
ifeq ($(DLSUFFIX), .so)
107123
LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname)
108124
SHLIB_LINK += -lc
@@ -114,16 +130,15 @@ endif
114130

115131
ifeq ($(PORTNAME), freebsd)
116132
ifdef ELF_SYSTEM
117-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
133+
shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
118134
LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname)
119135
else
120-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
136+
shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
121137
LINK.shared = $(LD) -x -Bshareable -Bforcearchive
122138
endif
123139
endif
124140

125141
ifeq ($(PORTNAME), netbsd)
126-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
127142
ifdef ELF_SYSTEM
128143
LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname)
129144
else
@@ -132,25 +147,23 @@ ifeq ($(PORTNAME), netbsd)
132147
endif
133148

134149
ifeq ($(PORTNAME), hpux)
135-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
150+
shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
136151
LINK.shared = $(LD) +h $(soname) -b +b $(libdir)
137152
ifeq ($(GCC), yes)
138153
SHLIB_LINK += `$(CC) -print-libgcc-file-name`
139154
endif
140155
endif
141156

142157
ifeq ($(PORTNAME), irix)
143-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
158+
shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
144159
LINK.shared = $(COMPILER) -shared -Wl,-set_version,sgi$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
145160
endif
146161

147162
ifeq ($(PORTNAME), linux)
148-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
149163
LINK.shared = $(COMPILER) -shared -Wl,-soname,$(soname)
150164
endif
151165

152166
ifeq ($(PORTNAME), solaris)
153-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
154167
ifeq ($(GCC), yes)
155168
LINK.shared = $(CC) -shared
156169
else
@@ -164,17 +177,14 @@ ifeq ($(PORTNAME), solaris)
164177
endif
165178

166179
ifeq ($(PORTNAME), sunos4)
167-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
168180
LINK.shared = $(LD) -assert pure-text -Bdynamic
169181
endif
170182

171183
ifeq ($(PORTNAME), osf)
172-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
173184
LINK.shared = $(LD) -shared -expect_unresolved '*'
174185
endif
175186

176187
ifeq ($(PORTNAME), sco)
177-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
178188
ifeq ($(GCC), yes)
179189
LINK.shared = $(CC) -shared
180190
else
@@ -184,17 +194,14 @@ ifeq ($(PORTNAME), sco)
184194
endif
185195

186196
ifeq ($(PORTNAME), svr4)
187-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
188197
LINK.shared = $(LD) -G
189198
endif
190199

191200
ifeq ($(PORTNAME), univel)
192-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
193201
LINK.shared = $(LD) -G -z text
194202
endif
195203

196204
ifeq ($(PORTNAME), unixware)
197-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
198205
ifeq ($(GCC), yes)
199206
LINK.shared = $(CC) -shared
200207
else
@@ -204,15 +211,15 @@ ifeq ($(PORTNAME), unixware)
204211
endif
205212

206213
ifeq ($(PORTNAME), cygwin)
207-
shlib := $(NAME)$(DLSUFFIX)
214+
shlib = $(NAME)$(DLSUFFIX)
208215
endif
209216

210217
ifeq ($(PORTNAME), win32)
211-
shlib := lib$(NAME)$(DLSUFFIX)
218+
shlib = lib$(NAME)$(DLSUFFIX)
212219
endif
213220

214221
ifeq ($(PORTNAME), beos)
215-
shlib := lib$(NAME)$(DLSUFFIX)
222+
shlib = lib$(NAME)$(DLSUFFIX)
216223
LINK.shared = $(LD) -nostart
217224
SHLIB_LINK += -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86
218225
endif
@@ -258,23 +265,23 @@ endif # not cygwin
258265

259266
ifeq ($(enable_shared), yes)
260267

261-
ifneq ($(PORTNAME), beos)
262-
ifneq ($(PORTNAME), cygwin)
263268
ifneq ($(PORTNAME), win32)
269+
ifneq ($(PORTNAME), cygwin)
270+
ifneq ($(PORTNAME), beos)
264271
ifneq ($(PORTNAME), aix)
265272

266273
# Normal case
267274
$(shlib): $(OBJS)
268275
$(LINK.shared) $(OBJS) $(SHLIB_LINK) -o $@
269276
# If we're using major and minor versions, then make a symlink to major-version-only.
270-
ifneq ($(shlib), lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION))
271-
rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
272-
$(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
277+
ifneq ($(shlib), $(shlib_major))
278+
rm -f $(shlib_major)
279+
$(LN_S) $(shlib) $(shlib_major)
273280
endif
274281
# Make sure we have a link to a name without any version numbers
275-
ifneq ($(shlib), lib$(NAME)$(DLSUFFIX))
276-
rm -f lib$(NAME)$(DLSUFFIX)
277-
$(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX)
282+
ifneq ($(shlib), $(shlib_bare))
283+
rm -f $(shlib_bare)
284+
$(LN_S) $(shlib) $(shlib_bare)
278285
endif
279286

280287
else # PORTNAME == aix
@@ -286,15 +293,14 @@ $(shlib): lib$(NAME).a
286293

287294
endif # PORTNAME == aix
288295

289-
else # PORTNAME == win32
296+
else # PORTNAME == beos
290297

291-
# win32 case
292-
$(shlib) lib$(NAME).a: $(OBJS)
293-
$(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS)
294-
$(DLLWRAP) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK)
295-
$(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a
298+
# BEOS case
299+
$(shlib): $(OBJS)
300+
ln -fs $(top_srcdir)/src/backend/postgres _APP_
301+
$(CC) -Xlinker -soname=$@ $(LDFLAGS_SL) -o $@ _APP_ $(OBJS) $(SHLIB_LINK)
296302

297-
endif # PORTNAME == win32
303+
endif # PORTNAME == beos
298304

299305
else # PORTNAME == cygwin
300306

@@ -309,14 +315,15 @@ $(DLLINIT): $(DLLINIT:%.o=%.c)
309315

310316
endif # PORTNAME == cygwin
311317

312-
else # PORTNAME == beos
318+
else # PORTNAME == win32
313319

314-
# BEOS case
315-
$(shlib): $(OBJS)
316-
ln -fs $(top_srcdir)/src/backend/postgres _APP_
317-
$(CC) -Xlinker -soname=$@ $(LDFLAGS_SL) -o $@ _APP_ $(OBJS) $(SHLIB_LINK)
320+
# win32 case
321+
$(shlib) lib$(NAME).a: $(OBJS)
322+
$(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS)
323+
$(DLLWRAP) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK)
324+
$(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a
318325

319-
endif # PORTNAME == beos
326+
endif # PORTNAME == win32
320327

321328
endif # enable_shared
322329

@@ -340,17 +347,16 @@ install-lib-shared: $(shlib)
340347
$(INSTALL_SHLIB) $< $(DESTDIR)$(libdir)/$(shlib)
341348
ifneq ($(PORTNAME), cygwin)
342349
ifneq ($(PORTNAME), win32)
343-
ifneq ($(shlib), lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION))
350+
ifneq ($(shlib), $(shlib_major))
344351
cd $(DESTDIR)$(libdir) && \
345-
rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) && \
346-
$(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
352+
rm -f $(shlib_major) && \
353+
$(LN_S) $(shlib) $(shlib_major)
347354
endif
348-
ifneq ($(shlib), lib$(NAME)$(DLSUFFIX))
355+
ifneq ($(shlib), $(shlib_bare))
349356
cd $(DESTDIR)$(libdir) && \
350-
rm -f lib$(NAME)$(DLSUFFIX) && \
351-
$(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX)
357+
rm -f $(shlib_bare) && \
358+
$(LN_S) $(shlib) $(shlib_bare)
352359
endif
353-
354360
endif # not win32
355361
endif # not cygwin
356362
endif # enable_shared
@@ -364,9 +370,9 @@ endif # enable_shared
364370
uninstall-lib:
365371
rm -f $(DESTDIR)$(libdir)/lib$(NAME).a
366372
ifeq ($(enable_shared), yes)
367-
rm -f $(DESTDIR)$(libdir)/lib$(NAME)$(DLSUFFIX) \
368-
$(DESTDIR)$(libdir)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) \
369-
$(DESTDIR)$(libdir)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
373+
rm -f $(DESTDIR)$(libdir)/$(shlib_bare) \
374+
$(DESTDIR)$(libdir)/$(shlib_major) \
375+
$(DESTDIR)$(libdir)/$(shlib)
370376
endif # enable_shared
371377

372378

@@ -378,7 +384,7 @@ endif # enable_shared
378384
clean-lib:
379385
rm -f lib$(NAME).a
380386
ifeq ($(enable_shared), yes)
381-
rm -f lib$(NAME)$(DLSUFFIX) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
387+
rm -f $(shlib_bare) $(shlib_major) $(shlib)
382388
ifdef EXPSUFF
383389
rm -f lib$(NAME)$(EXPSUFF)
384390
endif

‎src/interfaces/ecpg/compatlib/Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#-------------------------------------------------------------------------
22
#
3-
# Makefile for ecpg library
3+
# Makefile for ecpg compatibility library
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.17 2004/04/30 04:14:05 momjian Exp $
7+
# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.18 2004/07/13 00:06:39 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -15,6 +15,7 @@ include $(top_builddir)/src/Makefile.global
1515
NAME= ecpg_compat
1616
SO_MAJOR_VERSION= 1
1717
SO_MINOR_VERSION= 1
18+
DLTYPE= library
1819

1920
override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) \
2021
-I$(top_srcdir)/src/include/utils $(CPPFLAGS)

‎src/interfaces/ecpg/ecpglib/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.24 2004/05/25 21:20:44 momjian Exp $
7+
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.25 2004/07/13 00:06:41 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -15,6 +15,7 @@ include $(top_builddir)/src/Makefile.global
1515
NAME= ecpg
1616
SO_MAJOR_VERSION= 4
1717
SO_MINOR_VERSION= 2
18+
DLTYPE= library
1819

1920
override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/ecpg/include \
2021
-I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS)

‎src/interfaces/ecpg/pgtypeslib/Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#-------------------------------------------------------------------------
22
#
3-
# Makefile for ecpg library
3+
# Makefile for ecpg pgtypes library
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.21 2004/05/26 17:24:07 tgl Exp $
7+
# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.22 2004/07/13 00:06:43 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -15,6 +15,7 @@ include $(top_builddir)/src/Makefile.global
1515
NAME= pgtypes
1616
SO_MAJOR_VERSION= 1
1717
SO_MINOR_VERSION= 2
18+
DLTYPE= library
1819

1920
override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include \
2021
-I$(top_srcdir)/src/include/utils -I$(libpq_srcdir) $(CPPFLAGS) \

‎src/interfaces/libpq/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.111 2004/06/19 15:14:17 momjian Exp $
7+
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.112 2004/07/13 00:06:44 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -17,6 +17,7 @@ include $(top_builddir)/src/Makefile.global
1717
NAME= pq
1818
SO_MAJOR_VERSION= 3
1919
SO_MINOR_VERSION= 2
20+
DLTYPE= library
2021

2122
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port -DFRONTEND
2223
override CFLAGS += $(PTHREAD_CFLAGS)

0 commit comments

Comments
 (0)