mirror of
https://git.postgresql.org/git/postgresql.git
synced 2025-01-24 18:55:04 +08:00
Fix at least a few shared-library problems on Linux.
We have not seen the end of this issue :-(.
This commit is contained in:
parent
87225ca31d
commit
c7d9aca135
@ -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.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)
|
ifeq ($(PORTNAME), linux)
|
||||||
install-shlib-dep := install-shlib
|
install-shlib-dep := install-shlib
|
||||||
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
|
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
|
LDFLAGS_ODBC := -Bsymbolic -lc -lm
|
||||||
|
SHLIB_LINK += -lc
|
||||||
CFLAGS += $(CFLAGS_SL)
|
CFLAGS += $(CFLAGS_SL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
# Copyright (c) 1994, Regents of the University of California
|
# Copyright (c) 1994, Regents of the University of California
|
||||||
#
|
#
|
||||||
# IDENTIFICATION
|
# 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
|
OBJS+= common.o wchar.o conv.o
|
||||||
endif
|
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
|
# Shared library stuff, also default 'all' target
|
||||||
include $(SRCDIR)/Makefile.shlib
|
include $(SRCDIR)/Makefile.shlib
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user