Commitdd10d0d

committed

More chanes for bsdi_2_1 removal

1 parentfba75d0 commitdd10d0dCopy full SHA for dd10d0d

File tree

+14

-12

lines changed

+14

-12

lines changed

Lines changed: 5 additions & 5 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/Attic/Makefile.global,v 1.47 1996/11/0102:32:16 momjian Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.48 1996/11/0103:32:57 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`# NOTES`
`13`	`13`	`# This is seen by any Makefiles that include mk/postgres.mk. To`
`@@ -425,15 +425,15 @@ MK_PORT=bsdi`
`425`	`425`
`426`	`426`	`CC=gcc`
`427`	`427`
`428`		`-PRE_BSDI_2_1=N`
	`428`	`+PRE_BSDI_2_1= false`
`429`	`429`	`ifeq ($(shell uname -r), 2.0)`
`430`		`-PRE_BSDI_2_1=Y`
	`430`	`+PRE_BSDI_2_1= true`
`431`	`431`	`endif`
`432`	`432`	`ifeq ($(shell uname -r), 2.01)`
`433`		`-PRE_BSDI_2_1=Y`
	`433`	`+PRE_BSDI_2_1= true`
`434`	`434`	`endif`
`435`	`435`
`436`		`-ifeq ($(PRE_BSDI_2_1),N)`
	`436`	`+ifeq ($(PRE_BSDI_2_1),false)`
`437`	`437`	`# cc is gcc v1.42`
`438`	`438`	`# gcc is gcc v2.7.2`
`439`	`439`	`LEX=lex`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`#`
`35`	`35`	`#`
`36`	`36`	`# IDENTIFICATION`
`37`		`-# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.12 1996/11/0101:46:00 momjian Exp $`
	`37`	`+# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.13 1996/11/0103:35:43 momjian Exp $`
`38`	`38`	`#`
`39`	`39`	`#-------------------------------------------------------------------------`
`40`	`40`
`@@ -64,7 +64,7 @@ LDADD+= -lln`
`64`	`64`	`endif`
`65`	`65`
`66`	`66`	`ifeq ($(PORTNAME), bsdi)`
`67`		`- ifeq ($(PRE_BSDI_2_1),N)`
	`67`	`+ ifeq ($(PRE_BSDI_2_1),false)`
`68`	`68`	`LDADD+= -ldl -lipc`
`69`	`69`	`else`
`70`	`70`	`LDADD+= -ldld -lipc`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# Makefile for port/bsdi`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.2 1996/11/0101:46:21 momjian Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.3 1996/11/0103:35:54 momjian Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -17,7 +17,11 @@ INCLUDE_OPT = -I../.. \`
`17`	`17`
`18`	`18`	`CFLAGS+=$(INCLUDE_OPT)`
`19`	`19`
	`20`	`+ifeq ($(PRE_BSDI_2_1), false)`
	`21`	`+OBJS = port.o`
	`22`	`+else`
`20`	`23`	`OBJS = dynloader.o port.o`
	`24`	`+endif`
`21`	`25`
`22`	`26`	`all: SUBSYS.o`
`23`	`27`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: buf_internals.h,v 1.2 1996/10/31 09:49:42 scrappy Exp $`
	`9`	`+ * $Id: buf_internals.h,v 1.3 1996/11/01 03:36:13 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`* NOTE`
`12`	`12`	`*If BUFFERPAGE0 is defined, then 0 will be used as a`
`@@ -163,7 +163,6 @@ struct sbufdesc {`
`163`	`163`
`164`	`164`	`#if defined(PORTNAME_BSD44_derived)\|\| \`
`165`	`165`	`defined(PORTNAME_bsdi)\|\| \`
`166`		`- defined(PORTNAME_bsdi_2_1)\|\| \`
`167`	`166`	`defined(PORTNAME_i386_solaris)\|\| \`
`168`	`167`	`defined(PORTNAME_linux)\|\| \`
`169`	`168`	`defined(PORTNAME_sparc)\|\| \`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: ipc.h,v 1.6 1996/10/31 09:49:48 scrappy Exp $`
	`9`	`+ * $Id: ipc.h,v 1.7 1996/11/01 03:36:16 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`* NOTES`
`12`	`12`	`* This file is very architecture-specific. This stuff should actually`
`@@ -33,7 +33,6 @@`
`33`	`33`	`defined(PORTNAME_alpha)\|\| \`
`34`	`34`	`defined(PORTNAME_BSD44_derived)\|\| \`
`35`	`35`	`defined(PORTNAME_bsdi)\|\| \`
`36`		`- defined(PORTNAME_bsdi_2_1)\|\| \`
`37`	`36`	`defined(PORTNAME_hpux)\|\| \`
`38`	`37`	`defined(PORTNAME_i386_solaris)\|\| \`
`39`	`38`	`defined(PORTNAME_irix5)\|\| \`

Comments

(0)