Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c7d9aca

Browse files
committed
Fix at least a few shared-library problems on Linux.
We have not seen the end of this issue :-(.
1 parent 87225ca commit c7d9aca

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/Makefile.shlib

+3-2
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-
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.3 1998/10/31 03:58:51 scrappy Exp $
9+
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.4 1998/11/12 05:27:00 tgl Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -107,8 +107,9 @@ endif
107107
ifeq ($(PORTNAME), linux)
108108
install-shlib-dep := install-shlib
109109
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
110-
LDFLAGS_SL := -shared -soname $(shlib)
110+
LDFLAGS_SL := -Bdynamic -shared -soname $(shlib)
111111
LDFLAGS_ODBC := -Bsymbolic -lc -lm
112+
SHLIB_LINK += -lc
112113
CFLAGS += $(CFLAGS_SL)
113114
endif
114115

src/interfaces/libpq/Makefile.in

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1994, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.40 1998/10/19 00:00:43 tgl Exp $
9+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.41 1998/11/12 05:27:01 tgl Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -34,6 +34,10 @@ ifdef MULTIBYTE
3434
OBJS+= common.o wchar.o conv.o
3535
endif
3636

37+
# If crypt is a separate library, rather than part of libc,
38+
# make sure it gets included in shared libpq.
39+
SHLIB_LINK= $(findstring -lcrypt,$(LIBS))
40+
3741
# Shared library stuff, also default 'all' target
3842
include $(SRCDIR)/Makefile.shlib
3943

0 commit comments

Comments
 (0)