Commitcfef73b

committed

Update linux_i386 fix.

1 parent3727397 commitcfef73bCopy full SHA for cfef73b

File tree

+12

-35

lines changed

+12

-35

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ ifeq ($(PORTNAME), bsd)`
`31`	`31`	`CFLAGS +=$(CFLAGS_SL)`
`32`	`32`	`endif`
`33`	`33`	`endif`
`34`		`-#ifeq ($(PORTNAME),i386_solaris)`
	`34`	`+#ifeq ($(PORTNAME),solaris)`
`35`	`35`	`# install-shlib-dep := install-shlib`
`36`	`36`	`# shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
`37`	`37`	`# LDFLAGS_SL = -G -z text`

Lines changed: 3 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.18 1998/06/16 03:17:47 momjian Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.19 1998/07/12 18:48:05 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -33,7 +33,7 @@ shlib :=`
`33`	`33`
`34`	`34`	`LIBPQ= -L$(SRCDIR)/interfaces/libpq -lpq`
`35`	`35`
`36`		`-ifeq ($(PORTNAME),linux_i386)`
	`36`	`+ifeq ($(PORTNAME),linux)`
`37`	`37`	`install-shlib-dep:= install-shlib`
`38`	`38`	`shlib:= libpgtcl.so.1`
`39`	`39`	`CFLAGS+=$(CFLAGS_SL)`
`@@ -59,20 +59,13 @@ ifeq ($(PORTNAME), bsdi)`
`59`	`59`	`endif`
`60`	`60`	`endif`
`61`	`61`
`62`		`-ifeq ($(PORTNAME),solaris_i386)`
	`62`	`+ifeq ($(PORTNAME),solaris)`
`63`	`63`	`install-shlib-dep:= install-shlib`
`64`	`64`	`shlib:= libpgtcl.so.1`
`65`	`65`	`LDFLAGS_SL= -G -z text`
`66`	`66`	`CFLAGS+=$(CFLAGS_SL)`
`67`	`67`	`endif`
`68`	`68`
`69`		`-ifeq ($(PORTNAME), solaris_sparc)`
`70`		`-install-shlib-dep := install-shlib`
`71`		`-shlib := libpgtcl.so.1`
`72`		`-LDFLAGS_SL = -G`
`73`		`-CFLAGS +=$(CFLAGS_SL)`
`74`		`-endif`
`75`		`-`
`76`	`69`	`ifeq ($(PORTNAME), univel)`
`77`	`70`	`install-shlib-dep:= install-shlib`
`78`	`71`	`shlib:= libpgtcl.so.1`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.17 1998/06/15 21:01:48 momjian Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.18 1998/07/12 18:48:06 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -42,18 +42,20 @@ OBJS = pgenv.o pgconnection.o pgtransdb.o pgcursordb.o pglobject.o`
`42`	`42`	`# Shared library stuff`
`43`	`43`	`SHLIB :=`
`44`	`44`	`INSTALL-SHLIB-DEP :=`
`45`		`-ifeq ($(PORTNAME),linux_i386)`
	`45`	`+ifeq ($(PORTNAME),linux)`
`46`	`46`	`INSTALL-SHLIB-DEP := install-shlib`
`47`	`47`	`SHLIB := libpq++.so.1`
`48`	`48`	`LDFLAGS_SL = -shared -soname$(SHLIB)`
`49`	`49`	`CFLAGS +=$(CFLAGS_SL)`
`50`	`50`	`endif`
`51`		`-ifeq ($(PORTNAME), solaris_i386)`
	`51`	`+`
	`52`	`+ifeq ($(PORTNAME), solaris)`
`52`	`53`	`INSTALL-SHLIB-DEP := install-shlib`
`53`	`54`	`SHLIB := libpq++.so.1`
`54`	`55`	`LDFLAGS_SL = -G -z text -shared -soname$(SHLIB)`
`55`	`56`	`CFLAGS +=$(CFLAGS_SL)`
`56`	`57`	`endif`
	`58`	`+`
`57`	`59`	`ifeq ($(PORTNAME), hpux)`
`58`	`60`	`install-shlib-dep := install-shlib`
`59`	`61`	`shlib := libpq.sl`

Lines changed: 3 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.22 1998/06/16 07:29:45 momjian Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.23 1998/07/12 18:48:06 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -40,7 +40,7 @@ endif`
`40`	`40`	`shlib :=`
`41`	`41`	`install-shlib-dep :=`
`42`	`42`
`43`		`-ifeq ($(PORTNAME),linux_i386)`
	`43`	`+ifeq ($(PORTNAME),linux)`
`44`	`44`	`install-shlib-dep := install-shlib`
`45`	`45`	`shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
`46`	`46`	`LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION)`
`@@ -66,20 +66,13 @@ ifeq ($(PORTNAME), bsdi)`
`66`	`66`	`endif`
`67`	`67`	`endif`
`68`	`68`
`69`		`-ifeq ($(PORTNAME),solaris_i386)`
	`69`	`+ifeq ($(PORTNAME),solaris)`
`70`	`70`	`install-shlib-dep := install-shlib`
`71`	`71`	`shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
`72`	`72`	`LDFLAGS_SL = -G -z text`
`73`	`73`	`CFLAGS +=$(CFLAGS_SL)`
`74`	`74`	`endif`
`75`	`75`
`76`		`-ifeq ($(PORTNAME), solaris_sparc)`
`77`		`-install-shlib-dep := install-shlib`
`78`		`-shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
`79`		`-LDFLAGS_SL = -G`
`80`		`-CFLAGS +=$(CFLAGS_SL)`
`81`		`-endif`
`82`		`-`
`83`	`76`	`ifeq ($(PORTNAME), univel)`
`84`	`77`	`install-shlib-dep := install-shlib`
`85`	`78`	`shlib := libpq.so.1`

Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -169,17 +169,6 @@ The 'expected' files`
`169`	`169`	`careful (?) inspection. Many of the development machines are running a`
`170`	`170`	`Unix OS variant (FreeBSD, Linux, etc) on Ix86 hardware.`
`171`	`171`
`172`		`- The original 'expected.input' file was created on a SPARC Solaris 2.4`
`173`		`- system using the 'postgres5-1.02a5.tar.gz' source tree. It was compared`
`174`		`- with a file created on an I386 Solaris 2.4 system and the differences`
`175`		`- were only in the floating point polygons in the 3rd digit to the right`
`176`		`- of the decimal point. (see below)`
`177`		`-`
`178`		`- The original 'sample.regress.out' file was from the postgres-1.01 release`
`179`		`- constructed by Jolly Chen and is included here for reference. It may`
`180`		`- have been created on a DEC ALPHA machine as the 'Makefile.global'`
`181`		`- in the postgres-1.01 release has PORTNAME=alpha.`
`182`		`-`
`183`	`172`	`Current release notes (Thomas.Lockhart@jpl.nasa.gov)`
`184`	`173`
`185`	`174`	`The regression tests have been adapted and extensively modified for the`

Comments

(0)