From c7d9aca135b7af60f7e777df1ef99b19bd9e7348 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 12 Nov 1998 05:27:01 +0000 Subject: [PATCH] Fix at least a few shared-library problems on Linux. We have not seen the end of this issue :-(. --- src/Makefile.shlib | 5 +++-- src/interfaces/libpq/Makefile.in | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 60ead6597c..66b51fc118 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.4 1998/11/12 05:27:00 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 cff9f42834..6d60876dd6 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.41 1998/11/12 05:27:01 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 -- 2.40.0