From 66f893f3fe8a41c6c758b24905058c857c039045 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 12 Oct 1998 01:04:02 +0000
Subject: [PATCH] Solaris shared library fixes.

---
 src/interfaces/ecpg/lib/Makefile.in | 18 ++++++++++++------
 src/interfaces/libpgtcl/Makefile.in | 11 +++++++++--
 src/interfaces/libpq++/Makefile.in  | 11 +++++++++--
 src/interfaces/libpq/Makefile.in    | 11 +++++++++--
 src/pl/plpgsql/src/Makefile.in      |  9 +++++++--
 5 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in
index 642ec1be8b..2e24b509e6 100644
--- a/src/interfaces/ecpg/lib/Makefile.in
+++ b/src/interfaces/ecpg/lib/Makefile.in
@@ -32,12 +32,18 @@ ifeq ($(PORTNAME), bsd)
     CFLAGS += $(CFLAGS_SL)
   endif
 endif
-#ifeq ($(PORTNAME), solaris)
-#  install-shlib-dep := install-shlib
-#  shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
-#  LDFLAGS_SL = -G -z text
-#  CFLAGS += $(CFLAGS_SL)
-#endif
+ifeq ($(PORTNAME), solaris_sparc)
+  install-shlib-dep := install-shlib
+  shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
+  LDFLAGS_SL = -G -z text
+  CFLAGS += $(CFLAGS_SL)
+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)
   install-shlib-dep := install-shlib
   shlib := libecpg.so.1
diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in
index 5e557ebeb5..6dc067379a 100644
--- a/src/interfaces/libpgtcl/Makefile.in
+++ b/src/interfaces/libpgtcl/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # 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)
   endif
 endif
 
-ifeq ($(PORTNAME), solaris)
+ifeq ($(PORTNAME), solaris_sparc)
   install-shlib-dep	:= install-shlib
   shlib			:= libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   LDFLAGS_SL		:= -G -z text
   CFLAGS		+= $(CFLAGS_SL)
 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)
   install-shlib-dep	:= install-shlib
   shlib			:= libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
diff --git a/src/interfaces/libpq++/Makefile.in b/src/interfaces/libpq++/Makefile.in
index 7c57a06a0b..d2c58d0454 100644
--- a/src/interfaces/libpq++/Makefile.in
+++ b/src/interfaces/libpq++/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # 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)
   CFLAGS += $(CFLAGS_SL)
 endif
 
-ifeq ($(PORTNAME), solaris)
+ifeq ($(PORTNAME), solaris_sparc)
   INSTALL-SHLIB-DEP := install-shlib
   SHLIB := libpq++.so.1
   LDFLAGS_SL = -G -z text -shared -soname $(SHLIB)
   CFLAGS += $(CFLAGS_SL)
 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)
   install-shlib-dep := install-shlib
   shlib := libpq.so.1
diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in
index 495f0a3939..99561315e1 100644
--- a/src/interfaces/libpq/Makefile.in
+++ b/src/interfaces/libpq/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # 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)
   endif
 endif
 
-ifeq ($(PORTNAME), solaris)
+ifeq ($(PORTNAME), solaris_sparc)
   install-shlib-dep	:= install-shlib
   shlib			:= libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   LDFLAGS_SL		:= -G -z text
   CFLAGS		+= $(CFLAGS_SL)
 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)
   install-shlib-dep	:= install-shlib
   shlib			:= libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
diff --git a/src/pl/plpgsql/src/Makefile.in b/src/pl/plpgsql/src/Makefile.in
index aad3dcb0b4..cca844c08f 100644
--- a/src/pl/plpgsql/src/Makefile.in
+++ b/src/pl/plpgsql/src/Makefile.in
@@ -4,7 +4,7 @@
 #    Makefile for the plpgsql shared object
 #
 # 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)
   endif
 endif
 
-ifeq ($(PORTNAME), solaris)
+ifeq ($(PORTNAME), solaris_sparc)
   LDFLAGS_SL		:= -G -z text
   CFLAGS		+= $(CFLAGS_SL)
 endif
 
+ifeq ($(PORTNAME), solaris_i386)
+  LDFLAGS_SL		:= -G
+  CFLAGS		+= $(CFLAGS_SL)
+endif
+
 ifeq ($(PORTNAME), unixware)
   LDFLAGS_SL		:= -G -z text
   CFLAGS		+= $(CFLAGS_SL)