mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repair BSD/OS shared library fixes.

Browse Source
This commit is contained in:
Peter Eisentraut 2001-02-10 16:51:40 +00:00
parent d3fb67db26
commit 8213e63d8c
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile.shlib
View File

@ -6,7 +6,7 @@
# Copyright (c) 1998, Regents of the University of California # Copyright (c) 1998, Regents of the University of California
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.40 2001/02/10 16:26:38 momjian Exp $ # $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.41 2001/02/10 16:51:39 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -121,7 +121,8 @@ endif
ifeq ($(PORTNAME), bsdi) ifeq ($(PORTNAME), bsdi)
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
ifeq ($(DLSUFFIX), .so) ifeq ($(DLSUFFIX), .so)
LINK.shared = $(LD) -shared -soname $(soname) LINK.shared = $(COMPILER) -shared -Wl,-soname,$(soname)
SHLIB_LINK += -lc
endif endif
ifeq ($(DLSUFFIX), .o) ifeq ($(DLSUFFIX), .o)
LINK.shared = shlicc -O $(LDREL) LINK.shared = shlicc -O $(LDREL)

12
src/interfaces/odbc/GNUmakefile
View File

@ -2,7 +2,7 @@
# #
# GNUMakefile for psqlodbc (Postgres ODBC driver) # GNUMakefile for psqlodbc (Postgres ODBC driver)
# #
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.11 2001/02/10 15:59:16 momjian Exp $ # $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.12 2001/02/10 16:51:40 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -32,16 +32,8 @@ include $(top_srcdir)/src/Makefile.shlib
# Symbols must be resolved to the version in the shared library because # Symbols must be resolved to the version in the shared library because
# the driver manager (e.g., iodbc) provides some symbols with the same # the driver manager (e.g., iodbc) provides some symbols with the same
# names and we don't want those. (This issue is probably ELF specific.) # names and we don't want those. (This issue is probably ELF specific.)
#
# BSD/OS fails with libc and crt1.o undefined symbols without this.
# bjm 2001-02-09
#
ifneq ($(PORTNAME), bsdi)
LINK.shared += $(shlib_symbolic) LINK.shared += $(shlib_symbolic)
else
LINK.shared = gcc -shared -Wl,-Bsymbolic,-soname,$(soname)
SHLIB_LINK += -lc
endif
odbc_headers = isql.h isqlext.h iodbc.h odbc_headers = isql.h isqlext.h iodbc.h
odbc_includedir = $(includedir)/iodbc odbc_includedir = $(includedir)/iodbc

4
src/makefiles/Makefile.bsdi
View File

@ -15,10 +15,10 @@ endif
ifeq ($(DLSUFFIX), .so) ifeq ($(DLSUFFIX), .so)
CFLAGS_SL = -fpic CFLAGS_SL = -fpic
export_dynamic = -export-dynamic export_dynamic = -export-dynamic
shlib_symbolic = -Bsymbolic shlib_symbolic = -Wl,-Bsymbolic
else else
CFLAGS_SL = CFLAGS_SL =
endif endif
%.so: %.o %.so: %.o
$(LD) -shared -o $@ $< $(CC) -shared -o $@ $<