Commit8213e63

committed

Repair BSD/OS shared library fixes.

1 parentd3fb67d commit8213e63Copy full SHA for 8213e63

File tree

-14

lines changed

-14

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.40 2001/02/10 16:26:38 momjian Exp $`
	`9`	`+# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.41 2001/02/10 16:51:39 petere Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -121,7 +121,8 @@ endif`
`121`	`121`	`ifeq ($(PORTNAME), bsdi)`
`122`	`122`	`shlib:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
`123`	`123`	`ifeq ($(DLSUFFIX), .so)`
`124`		`- LINK.shared= $(LD) -shared -soname $(soname)`
	`124`	`+ LINK.shared= $(COMPILER) -shared -Wl,-soname,$(soname)`
	`125`	`+ SHLIB_LINK+= -lc`
`125`	`126`	`endif`
`126`	`127`	`ifeq ($(DLSUFFIX), .o)`
`127`	`128`	`LINK.shared= shlicc -O $(LDREL)`

Lines changed: 2 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# GNUMakefile for psqlodbc (Postgres ODBC driver)`
`4`	`4`	`#`
`5`		`-# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.11 2001/02/1015:59:16 momjian Exp $`
	`5`	`+# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.12 2001/02/1016:51:40 petere Exp $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`@@ -32,16 +32,8 @@ include $(top_srcdir)/src/Makefile.shlib`
`32`	`32`	`# Symbols must be resolved to the version in the shared library because`
`33`	`33`	`# the driver manager (e.g., iodbc) provides some symbols with the same`
`34`	`34`	`# names and we don't want those. (This issue is probably ELF specific.)`
`35`		`-#`
`36`		`-# BSD/OS fails with libc and crt1.o undefined symbols without this.`
`37`		`-# bjm 2001-02-09`
`38`		`-#`
`39`		`-ifneq ($(PORTNAME), bsdi)`
	`35`	`+`
`40`	`36`	`LINK.shared +=$(shlib_symbolic)`
`41`		`-else`
`42`		`-LINK.shared = gcc -shared -Wl,-Bsymbolic,-soname,$(soname)`
`43`		`-SHLIB_LINK += -lc`
`44`		`-endif`
`45`	`37`
`46`	`38`	`odbc_headers = isql.h isqlext.h iodbc.h`
`47`	`39`	`odbc_includedir =$(includedir)/iodbc`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@ endif`
`15`	`15`	`ifeq ($(DLSUFFIX), .so)`
`16`	`16`	`CFLAGS_SL = -fpic`
`17`	`17`	`export_dynamic = -export-dynamic`
`18`		`-shlib_symbolic = -Bsymbolic`
	`18`	`+shlib_symbolic = -Wl,-Bsymbolic`
`19`	`19`	`else`
`20`	`20`	`CFLAGS_SL =`
`21`	`21`	`endif`
`22`	`22`
`23`	`23`	`%.so: %.o`
`24`		`-$(LD) -shared -o $@ $<`
	`24`	`+$(CC) -shared -o $@ $<`

Comments

(0)