Commitc7d9aca

committed

Fix at least a few shared-library problems on Linux.

We have not seen the end of this issue :-(.

1 parent87225ca commitc7d9acaCopy full SHA for c7d9aca

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# Copyright (c) 1998, Regents of the University of California`
`7`	`7`	`#`
`8`	`8`	`# 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 $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -107,8 +107,9 @@ endif`
`107`	`107`	`ifeq ($(PORTNAME), linux)`
`108`	`108`	`install-shlib-dep:= install-shlib`
`109`	`109`	`shlib:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
`110`		`- LDFLAGS_SL:= -shared -soname $(shlib)`
	`110`	`+ LDFLAGS_SL:= -Bdynamic -shared -soname $(shlib)`
`111`	`111`	`LDFLAGS_ODBC:= -Bsymbolic -lc -lm`
	`112`	`+ SHLIB_LINK+= -lc`
`112`	`113`	`CFLAGS+= $(CFLAGS_SL)`
`113`	`114`	`endif`
`114`	`115`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`#`
`8`	`8`	`# 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 $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -34,6 +34,10 @@ ifdef MULTIBYTE`
`34`	`34`	`OBJS+= common.o wchar.o conv.o`
`35`	`35`	`endif`
`36`	`36`
	`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`	`+`
`37`	`41`	`# Shared library stuff, also default 'all' target`
`38`	`42`	`include$(SRCDIR)/Makefile.shlib`
`39`	`43`

Comments

(0)