]> granicus.if.org Git - postgresql/commitdiff
Solaris shared library fixes.
authorBruce Momjian <bruce@momjian.us>
Mon, 12 Oct 1998 01:04:02 +0000 (01:04 +0000)
committerBruce Momjian <bruce@momjian.us>
Mon, 12 Oct 1998 01:04:02 +0000 (01:04 +0000)
src/interfaces/ecpg/lib/Makefile.in
src/interfaces/libpgtcl/Makefile.in
src/interfaces/libpq++/Makefile.in
src/interfaces/libpq/Makefile.in
src/pl/plpgsql/src/Makefile.in

index 642ec1be8bb260eee4a85d6e0baf9ea3e372d909..2e24b509e6c6a5ef70f56592a14c08bb98619c7f 100644 (file)
@@ -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
index 5e557ebeb56ca10c0b2d88e7d6e065b8bda9d8c0..6dc067379aa70d7369a71f38869be05a3bd04fd5 100644 (file)
@@ -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)
index 7c57a06a0badf1dd71ce2bf706a257f5a9367f54..d2c58d04545cb83804181ce31c17b0c921b1d761 100644 (file)
@@ -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
index 495f0a393959d2165e662cbe66ef23357c6257da..99561315e1527beefc5c8bd4fead2c9e0a744731 100644 (file)
@@ -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)
index aad3dcb0b441d6ce4df887d2fe3ef9d2188bbfe5..cca844c08f99094962dd96e1cc06f34d6e9a1304 100644 (file)
@@ -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)