Commit 66f893f3 authored by Bruce Momjian's avatar Bruce Momjian

Solaris shared library fixes.

parent beac8c1c
...@@ -32,12 +32,18 @@ ifeq ($(PORTNAME), bsd) ...@@ -32,12 +32,18 @@ ifeq ($(PORTNAME), bsd)
CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
endif endif
endif endif
#ifeq ($(PORTNAME), solaris) ifeq ($(PORTNAME), solaris_sparc)
# install-shlib-dep := install-shlib install-shlib-dep := install-shlib
# shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL) shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
# LDFLAGS_SL = -G -z text LDFLAGS_SL = -G -z text
# CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
#endif endif
ifeq ($(PORTNAME), solaris_i386)
install-shlib-dep := install-shlib
shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
LDFLAGS_SL = -G
CFLAGS += $(CFLAGS_SL)
endif
ifeq ($(PORTNAME), univel) ifeq ($(PORTNAME), univel)
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := libecpg.so.1 shlib := libecpg.so.1
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.26 1998/10/09 21:28:46 momjian Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.27 1998/10/12 01:03:57 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -70,13 +70,20 @@ ifeq ($(PORTNAME), bsdi) ...@@ -70,13 +70,20 @@ ifeq ($(PORTNAME), bsdi)
endif endif
endif endif
ifeq ($(PORTNAME), solaris) ifeq ($(PORTNAME), solaris_sparc)
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
LDFLAGS_SL := -G -z text LDFLAGS_SL := -G -z text
CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
endif endif
ifeq ($(PORTNAME), solaris_i386)
install-shlib-dep := install-shlib
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
LDFLAGS_SL := -G
CFLAGS += $(CFLAGS_SL)
endif
ifeq ($(PORTNAME), unixware) ifeq ($(PORTNAME), unixware)
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) shlib := libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.4 1998/10/10 17:08:11 thomas Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.5 1998/10/12 01:04:00 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -57,13 +57,20 @@ ifeq ($(PORTNAME), linux) ...@@ -57,13 +57,20 @@ ifeq ($(PORTNAME), linux)
CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
endif endif
ifeq ($(PORTNAME), solaris) ifeq ($(PORTNAME), solaris_sparc)
INSTALL-SHLIB-DEP := install-shlib INSTALL-SHLIB-DEP := install-shlib
SHLIB := libpq++.so.1 SHLIB := libpq++.so.1
LDFLAGS_SL = -G -z text -shared -soname $(SHLIB) LDFLAGS_SL = -G -z text -shared -soname $(SHLIB)
CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
endif endif
ifeq ($(PORTNAME), solaris_i386)
INSTALL-SHLIB-DEP := install-shlib
SHLIB := libpq++.so.1
LDFLAGS_SL = -G -shared -soname $(SHLIB)
CFLAGS += $(CFLAGS_SL)
endif
ifeq ($(PORTNAME), unixware) ifeq ($(PORTNAME), unixware)
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := libpq.so.1 shlib := libpq.so.1
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.34 1998/10/09 21:28:48 momjian Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.35 1998/10/12 01:03:58 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -74,13 +74,20 @@ ifeq ($(PORTNAME), bsdi) ...@@ -74,13 +74,20 @@ ifeq ($(PORTNAME), bsdi)
endif endif
endif endif
ifeq ($(PORTNAME), solaris) ifeq ($(PORTNAME), solaris_sparc)
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
LDFLAGS_SL := -G -z text LDFLAGS_SL := -G -z text
CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
endif endif
ifeq ($(PORTNAME), solaris_i386)
install-shlib-dep := install-shlib
shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
LDFLAGS_SL := -G
CFLAGS += $(CFLAGS_SL)
endif
ifeq ($(PORTNAME), unixware) ifeq ($(PORTNAME), unixware)
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for the plpgsql shared object # Makefile for the plpgsql shared object
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.5 1998/10/09 16:57:07 momjian Exp $ # $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.6 1998/10/12 01:04:02 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -54,11 +54,16 @@ ifeq ($(PORTNAME), bsdi) ...@@ -54,11 +54,16 @@ ifeq ($(PORTNAME), bsdi)
endif endif
endif endif
ifeq ($(PORTNAME), solaris) ifeq ($(PORTNAME), solaris_sparc)
LDFLAGS_SL := -G -z text LDFLAGS_SL := -G -z text
CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
endif endif
ifeq ($(PORTNAME), solaris_i386)
LDFLAGS_SL := -G
CFLAGS += $(CFLAGS_SL)
endif
ifeq ($(PORTNAME), unixware) ifeq ($(PORTNAME), unixware)
LDFLAGS_SL := -G -z text LDFLAGS_SL := -G -z text
CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment