summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian1998-10-12 01:04:02 +0000
committerBruce Momjian1998-10-12 01:04:02 +0000
commit66f893f3fe8a41c6c758b24905058c857c039045 (patch)
tree156bf2f81716fe7d54cdae0388e5b6accb474641
parentbeac8c1c4609eb7dcb24e5352c66f3b70682d331 (diff)
Solaris shared library fixes.
-rw-r--r--src/interfaces/ecpg/lib/Makefile.in18
-rw-r--r--src/interfaces/libpgtcl/Makefile.in11
-rw-r--r--src/interfaces/libpq++/Makefile.in11
-rw-r--r--src/interfaces/libpq/Makefile.in11
-rw-r--r--src/pl/plpgsql/src/Makefile.in9
5 files changed, 46 insertions, 14 deletions
diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in
index 642ec1be8bb..2e24b509e6c 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 5e557ebeb56..6dc067379aa 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 7c57a06a0ba..d2c58d04545 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 495f0a39395..99561315e15 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 aad3dcb0b44..cca844c08f9 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)