diff options
| author | Tom Lane | 1998-11-12 05:25:05 +0000 |
|---|---|---|
| committer | Tom Lane | 1998-11-12 05:25:05 +0000 |
| commit | 555eadc904a467023ac0b1c66e54f017eb3d472c (patch) | |
| tree | e21b7ff1887faf2d086133044e562ce58cba6fce | |
| parent | ddb06e30e4702b0d8900b469dea083d26cfd7365 (diff) | |
Fix at least a few shared-library problems on Linux.
We have not seen the end of this issue :-(.
| -rw-r--r-- | src/Makefile.shlib | 5 | ||||
| -rw-r--r-- | src/interfaces/libpq/Makefile.in | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 60ead6597c9..51e5fdbb5d3 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.3 1998/10/31 03:58:51 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.3.2.1 1998/11/12 05:25:03 tgl Exp $ # #------------------------------------------------------------------------- @@ -107,8 +107,9 @@ endif ifeq ($(PORTNAME), linux) install-shlib-dep := install-shlib shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) - LDFLAGS_SL := -shared -soname $(shlib) + LDFLAGS_SL := -Bdynamic -shared -soname $(shlib) LDFLAGS_ODBC := -Bsymbolic -lc -lm + SHLIB_LINK += -lc CFLAGS += $(CFLAGS_SL) endif diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in index cff9f428349..a4b9569f543 100644 --- a/src/interfaces/libpq/Makefile.in +++ b/src/interfaces/libpq/Makefile.in @@ -6,7 +6,7 @@ # Copyright (c) 1994, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.40 1998/10/19 00:00:43 tgl Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.40.2.1 1998/11/12 05:25:05 tgl Exp $ # #------------------------------------------------------------------------- @@ -34,6 +34,10 @@ ifdef MULTIBYTE OBJS+= common.o wchar.o conv.o endif +# If crypt is a separate library, rather than part of libc, +# make sure it gets included in shared libpq. +SHLIB_LINK= $(findstring -lcrypt,$(LIBS)) + # Shared library stuff, also default 'all' target include $(SRCDIR)/Makefile.shlib |