Update linux_i386 fix.

This commit is contained in:
Bruce Momjian 1998-07-12 18:48:08 +00:00
parent 37273977cb
commit cfef73b4c0
5 changed files with 12 additions and 35 deletions

View File

@ -31,7 +31,7 @@ ifeq ($(PORTNAME), bsd)
CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
endif endif
endif endif
#ifeq ($(PORTNAME), i386_solaris) #ifeq ($(PORTNAME), solaris)
# install-shlib-dep := install-shlib # install-shlib-dep := install-shlib
# shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) # shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
# LDFLAGS_SL = -G -z text # LDFLAGS_SL = -G -z text

View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # 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 LIBPQ = -L$(SRCDIR)/interfaces/libpq -lpq
ifeq ($(PORTNAME), linux_i386) ifeq ($(PORTNAME), linux)
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := libpgtcl.so.1 shlib := libpgtcl.so.1
CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
@ -59,20 +59,13 @@ ifeq ($(PORTNAME), bsdi)
endif endif
endif endif
ifeq ($(PORTNAME), solaris_i386) ifeq ($(PORTNAME), solaris)
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := libpgtcl.so.1 shlib := libpgtcl.so.1
LDFLAGS_SL = -G -z text LDFLAGS_SL = -G -z text
CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
endif endif
ifeq ($(PORTNAME), solaris_sparc)
install-shlib-dep := install-shlib
shlib := libpgtcl.so.1
LDFLAGS_SL = -G
CFLAGS += $(CFLAGS_SL)
endif
ifeq ($(PORTNAME), univel) ifeq ($(PORTNAME), univel)
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := libpgtcl.so.1 shlib := libpgtcl.so.1

View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # 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 # Shared library stuff
SHLIB := SHLIB :=
INSTALL-SHLIB-DEP := INSTALL-SHLIB-DEP :=
ifeq ($(PORTNAME), linux_i386) ifeq ($(PORTNAME), linux)
INSTALL-SHLIB-DEP := install-shlib INSTALL-SHLIB-DEP := install-shlib
SHLIB := libpq++.so.1 SHLIB := libpq++.so.1
LDFLAGS_SL = -shared -soname $(SHLIB) LDFLAGS_SL = -shared -soname $(SHLIB)
CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
endif endif
ifeq ($(PORTNAME), solaris_i386)
ifeq ($(PORTNAME), solaris)
INSTALL-SHLIB-DEP := install-shlib INSTALL-SHLIB-DEP := install-shlib
SHLIB := libpq++.so.1 SHLIB := libpq++.so.1
LDFLAGS_SL = -G -z text -shared -soname $(SHLIB) LDFLAGS_SL = -G -z text -shared -soname $(SHLIB)
CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
endif endif
ifeq ($(PORTNAME), hpux) ifeq ($(PORTNAME), hpux)
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := libpq.sl shlib := libpq.sl

View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # 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 := shlib :=
install-shlib-dep := install-shlib-dep :=
ifeq ($(PORTNAME), linux_i386) ifeq ($(PORTNAME), linux)
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION) LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION)
@ -66,20 +66,13 @@ ifeq ($(PORTNAME), bsdi)
endif endif
endif endif
ifeq ($(PORTNAME), solaris_i386) ifeq ($(PORTNAME), solaris)
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
LDFLAGS_SL = -G -z text LDFLAGS_SL = -G -z text
CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
endif 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) ifeq ($(PORTNAME), univel)
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := libpq.so.1 shlib := libpq.so.1

View File

@ -169,17 +169,6 @@ The 'expected' files
careful (?) inspection. Many of the development machines are running a careful (?) inspection. Many of the development machines are running a
Unix OS variant (FreeBSD, Linux, etc) on Ix86 hardware. 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) Current release notes (Thomas.Lockhart@jpl.nasa.gov)
The regression tests have been adapted and extensively modified for the The regression tests have been adapted and extensively modified for the