Solaris shared library fixes.

diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in
index 642ec1be8bb260eee4a85d6e0baf9ea3e372d909..2e24b509e6c6a5ef70f56592a14c08bb98619c7f 100644 (file)
--- 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 9b60decca233a9a8904621cbdb01ff810c2e42af..1d9dc22a350834d86047e3643c852792b5695997 100644 (file)
--- a/src/interfaces/libpgtcl/Makefile.in
+++ b/src/interfaces/libpgtcl/Makefile.in
@@ -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 df7f87eadd6e546f67526f7494c47032cbf3a2e4..cb8728d263be4b202a006e47686375488e39946f 100644 (file)
--- a/src/interfaces/libpq++/Makefile.in
+++ b/src/interfaces/libpq++/Makefile.in
@@ -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 3ac288e37e3b9735acddda1bddf7c48751aa90b0..09a00c53bb1cfba71629cb593d2160cd2529f170 100644 (file)
--- a/src/interfaces/libpq/Makefile.in
+++ b/src/interfaces/libpq/Makefile.in
@@ -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 25c81c7c8c249f0d1e524a61db56260c7833beba..54e4c307933bcc70bbab06595baf8f80695cdc7d 100644 (file)
--- a/src/pl/plpgsql/src/Makefile.in
+++ b/src/pl/plpgsql/src/Makefile.in
@@ -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)