From dd10d0de23b3f90fbce810e64c417750b8a836e9 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 1 Nov 1996 03:36:16 +0000
Subject: [PATCH] More chanes for bsdi_2_1 removal
---
src/Makefile.global | 10 +++++-----
src/backend/Makefile | 4 ++--
src/backend/port/bsdi/Makefile | 6 +++++-
src/include/storage/buf_internals.h | 3 +--
src/include/storage/ipc.h | 3 +--
5 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/Makefile.global b/src/Makefile.global
index 99d46283cde..bc5facfed78 100644
--- a/src/Makefile.global
+++ b/src/Makefile.global
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.47 1996/11/01 02:32:16 momjian Exp $
+# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.48 1996/11/01 03:32:57 momjian Exp $
#
# NOTES
# This is seen by any Makefiles that include mk/postgres.mk. To
@@ -425,15 +425,15 @@ MK_PORT= bsdi
CC= gcc
-PRE_BSDI_2_1=N
+PRE_BSDI_2_1= false
ifeq ($(shell uname -r), 2.0)
-PRE_BSDI_2_1=Y
+PRE_BSDI_2_1= true
endif
ifeq ($(shell uname -r), 2.01)
-PRE_BSDI_2_1=Y
+PRE_BSDI_2_1= true
endif
-ifeq ($(PRE_BSDI_2_1), N)
+ifeq ($(PRE_BSDI_2_1), false)
# cc is gcc v1.42
# gcc is gcc v2.7.2
LEX= lex
diff --git a/src/backend/Makefile b/src/backend/Makefile
index c79d1af2eb6..11fa20b12a4 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -34,7 +34,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.12 1996/11/01 01:46:00 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.13 1996/11/01 03:35:43 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -64,7 +64,7 @@ LDADD+= -lln
endif
ifeq ($(PORTNAME), bsdi)
- ifeq ($(PRE_BSDI_2_1), N)
+ ifeq ($(PRE_BSDI_2_1), false)
LDADD+= -ldl -lipc
else
LDADD+= -ldld -lipc
diff --git a/src/backend/port/bsdi/Makefile b/src/backend/port/bsdi/Makefile
index 093a9a2614b..97b5cbcc1f7 100644
--- a/src/backend/port/bsdi/Makefile
+++ b/src/backend/port/bsdi/Makefile
@@ -4,7 +4,7 @@
# Makefile for port/bsdi
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.2 1996/11/01 01:46:21 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.3 1996/11/01 03:35:54 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -17,7 +17,11 @@ INCLUDE_OPT = -I../.. \
CFLAGS+=$(INCLUDE_OPT)
+ifeq ($(PRE_BSDI_2_1), false)
+OBJS = port.o
+else
OBJS = dynloader.o port.o
+endif
all: SUBSYS.o
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index c01d6df82aa..d4c5a3eca7f 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: buf_internals.h,v 1.2 1996/10/31 09:49:42 scrappy Exp $
+ * $Id: buf_internals.h,v 1.3 1996/11/01 03:36:13 momjian Exp $
*
* NOTE
* If BUFFERPAGE0 is defined, then 0 will be used as a
@@ -163,7 +163,6 @@ struct sbufdesc {
#if defined(PORTNAME_BSD44_derived) || \
defined(PORTNAME_bsdi) || \
- defined(PORTNAME_bsdi_2_1) || \
defined(PORTNAME_i386_solaris) || \
defined(PORTNAME_linux) || \
defined(PORTNAME_sparc) || \
diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index ea7d9a73b42..3d26e1483ff 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: ipc.h,v 1.6 1996/10/31 09:49:48 scrappy Exp $
+ * $Id: ipc.h,v 1.7 1996/11/01 03:36:16 momjian Exp $
*
* NOTES
* This file is very architecture-specific. This stuff should actually
@@ -33,7 +33,6 @@
defined(PORTNAME_alpha) || \
defined(PORTNAME_BSD44_derived) || \
defined(PORTNAME_bsdi) || \
- defined(PORTNAME_bsdi_2_1) || \
defined(PORTNAME_hpux) || \
defined(PORTNAME_i386_solaris) || \
defined(PORTNAME_irix5) || \
--
GitLab