From cfef73b4c000aba86621f312dc12963d83c8f19b Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sun, 12 Jul 1998 18:48:08 +0000 Subject: [PATCH] Update linux_i386 fix. --- src/interfaces/ecpg/lib/Makefile.in | 2 +- src/interfaces/libpgtcl/Makefile.in | 13 +++---------- src/interfaces/libpq++/Makefile | 8 +++++--- src/interfaces/libpq/Makefile.in | 13 +++---------- src/test/regress/README | 11 ----------- 5 files changed, 12 insertions(+), 35 deletions(-) diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in index 1b38c6a539..6387a20341 100644 --- a/src/interfaces/ecpg/lib/Makefile.in +++ b/src/interfaces/ecpg/lib/Makefile.in @@ -31,7 +31,7 @@ ifeq ($(PORTNAME), bsd) CFLAGS += $(CFLAGS_SL) endif endif -#ifeq ($(PORTNAME), i386_solaris) +#ifeq ($(PORTNAME), solaris) # install-shlib-dep := install-shlib # shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) # LDFLAGS_SL = -G -z text diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in index d11f099ae6..2823aeade1 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.18 1998/06/16 03:17:47 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.19 1998/07/12 18:48:05 momjian Exp $ # #------------------------------------------------------------------------- @@ -33,7 +33,7 @@ shlib := LIBPQ = -L$(SRCDIR)/interfaces/libpq -lpq -ifeq ($(PORTNAME), linux_i386) +ifeq ($(PORTNAME), linux) install-shlib-dep := install-shlib shlib := libpgtcl.so.1 CFLAGS += $(CFLAGS_SL) @@ -59,20 +59,13 @@ ifeq ($(PORTNAME), bsdi) endif endif -ifeq ($(PORTNAME), solaris_i386) +ifeq ($(PORTNAME), solaris) install-shlib-dep := install-shlib shlib := libpgtcl.so.1 LDFLAGS_SL = -G -z text CFLAGS += $(CFLAGS_SL) endif -ifeq ($(PORTNAME), solaris_sparc) - install-shlib-dep := install-shlib - shlib := libpgtcl.so.1 - LDFLAGS_SL = -G - CFLAGS += $(CFLAGS_SL) -endif - ifeq ($(PORTNAME), univel) install-shlib-dep := install-shlib shlib := libpgtcl.so.1 diff --git a/src/interfaces/libpq++/Makefile b/src/interfaces/libpq++/Makefile index da16b32f50..e1e99eed0c 100644 --- a/src/interfaces/libpq++/Makefile +++ b/src/interfaces/libpq++/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.17 1998/06/15 21:01:48 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.18 1998/07/12 18:48:06 momjian Exp $ # #------------------------------------------------------------------------- @@ -42,18 +42,20 @@ OBJS = pgenv.o pgconnection.o pgtransdb.o pgcursordb.o pglobject.o # Shared library stuff SHLIB := INSTALL-SHLIB-DEP := -ifeq ($(PORTNAME), linux_i386) +ifeq ($(PORTNAME), linux) INSTALL-SHLIB-DEP := install-shlib SHLIB := libpq++.so.1 LDFLAGS_SL = -shared -soname $(SHLIB) CFLAGS += $(CFLAGS_SL) endif -ifeq ($(PORTNAME), solaris_i386) + +ifeq ($(PORTNAME), solaris) INSTALL-SHLIB-DEP := install-shlib SHLIB := libpq++.so.1 LDFLAGS_SL = -G -z text -shared -soname $(SHLIB) CFLAGS += $(CFLAGS_SL) endif + ifeq ($(PORTNAME), hpux) install-shlib-dep := install-shlib shlib := libpq.sl diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in index 5e59f56663..6f7b7170d8 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.22 1998/06/16 07:29:45 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.23 1998/07/12 18:48:06 momjian Exp $ # #------------------------------------------------------------------------- @@ -40,7 +40,7 @@ endif shlib := install-shlib-dep := -ifeq ($(PORTNAME), linux_i386) +ifeq ($(PORTNAME), linux) install-shlib-dep := install-shlib shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION) @@ -66,20 +66,13 @@ ifeq ($(PORTNAME), bsdi) endif endif -ifeq ($(PORTNAME), solaris_i386) +ifeq ($(PORTNAME), solaris) 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_sparc) - install-shlib-dep := install-shlib - shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) - LDFLAGS_SL = -G - CFLAGS += $(CFLAGS_SL) -endif - ifeq ($(PORTNAME), univel) install-shlib-dep := install-shlib shlib := libpq.so.1 diff --git a/src/test/regress/README b/src/test/regress/README index a73b6f05c2..13d5112dae 100644 --- a/src/test/regress/README +++ b/src/test/regress/README @@ -169,17 +169,6 @@ The 'expected' files careful (?) inspection. Many of the development machines are running a Unix OS variant (FreeBSD, Linux, etc) on Ix86 hardware. - The original 'expected.input' file was created on a SPARC Solaris 2.4 - system using the 'postgres5-1.02a5.tar.gz' source tree. It was compared - with a file created on an I386 Solaris 2.4 system and the differences - were only in the floating point polygons in the 3rd digit to the right - of the decimal point. (see below) - - The original 'sample.regress.out' file was from the postgres-1.01 release - constructed by Jolly Chen and is included here for reference. It may - have been created on a DEC ALPHA machine as the 'Makefile.global' - in the postgres-1.01 release has PORTNAME=alpha. - Current release notes (Thomas.Lockhart@jpl.nasa.gov) The regression tests have been adapted and extensively modified for the