Commit45ff93c

committed

Include -lcrypt when needed to link libpgtcl.so and plpgsql.so

1 parentafd57db commit45ff93cCopy full SHA for 45ff93c

File tree

+14

-12

lines changed

+14

-12

lines changed

Lines changed: 7 additions & 2 deletions

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/libpgtcl/Attic/Makefile.in,v 1.33 1998/10/19 00:00:41 tgl Exp $`
	`9`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.34 1999/02/07 22:10:45 tgl Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -27,7 +27,12 @@ endif`
`27`	`27`
`28`	`28`	`OBJS= pgtcl.o pgtclCmds.o pgtclId.o`
`29`	`29`
`30`		`-SHLIB_LINK= -L../libpq -lpq`
	`30`	`+SHLIB_LINK+= -L../libpq -lpq`
	`31`	`+`
	`32`	`+# If crypt is a separate library, rather than part of libc, it may need`
	`33`	`+# to be referenced separately to keep (broken) linkers happy. (This is`
	`34`	`+# braindead; users of libpq should not need to know what it depends on.)`
	`35`	`+SHLIB_LINK+=$(findstring -lcrypt,$(LIBS))`
`31`	`36`
`32`	`37`	`# Shared library stuff, also default 'all' target`
`33`	`38`	`include$(SRCDIR)/Makefile.shlib`

Lines changed: 1 addition & 5 deletions

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.43 1999/02/02 18:51:29 momjian Exp $`
	`9`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.44 1999/02/07 22:10:46 tgl Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -36,11 +36,7 @@ endif`
`36`	`36`
`37`	`37`	`# If crypt is a separate library, rather than part of libc,`
`38`	`38`	`# make sure it gets included in shared libpq.`
`39`		`-ifeq ($(PORTNAME), win)`
`40`	`39`	`SHLIB_LINK+=$(findstring -lcrypt,$(LIBS))`
`41`		`-else`
`42`		`-SHLIB_LINK=$(findstring -lcrypt,$(LIBS))`
`43`		`-endif`
`44`	`40`
`45`	`41`	`# Shared library stuff, also default 'all' target`
`46`	`42`	`include$(SRCDIR)/Makefile.shlib`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# Makefile for the plpgsql shared object`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.13 1999/01/17 06:19:53 momjian Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.14 1999/02/07 22:10:47 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -24,11 +24,12 @@ LFLAGS+= -i -l`
`24`	`24`
`25`	`25`	`OBJS=pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o`
`26`	`26`
`27`		`-ifeq ($(PORTNAME), win)`
`28`	`27`	`SHLIB_LINK+= -L$(LIBPQDIR) -lpq`
`29`		`-else`
`30`		`-SHLIB_LINK= -L$(LIBPQDIR) -lpq`
`31`		`-endif`
	`28`	`+`
	`29`	`+# If crypt is a separate library, rather than part of libc, it may need`
	`30`	`+# to be referenced separately to keep (broken) linkers happy. (This is`
	`31`	`+# braindead; users of libpq should not need to know what it depends on.)`
	`32`	`+SHLIB_LINK+=$(findstring -lcrypt,$(LIBS))`
`32`	`33`
`33`	`34`	`# Shared library stuff, also default 'all' target`
`34`	`35`	`include$(SRCDIR)/Makefile.shlib`

Comments

(0)