Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit55aab6a

Browse files
committed
fix: BSDi 2.1 requires a port seperate from BSDi 2.0{.1}
submitted by: Bruce Momjian (root@candle.pha.pa.us)
1 parentbf2abf0 commit55aab6a

File tree

15 files changed

+138
-23
lines changed

15 files changed

+138
-23
lines changed

‎src/Makefile.global

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.3 1996/07/15 19:10:32 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.4 1996/07/16 07:12:10 scrappy Exp $
1111
#
1212
# NOTES
1313
# This is seen by any Makefiles that include mk/postgres.mk. To
@@ -43,6 +43,7 @@
4343
#"LINUX_ELF=1" in src/mk/port/postgres.mk.linux)
4444
#BSD44_derived-OSs derived from 4.4-lite BSD (NetBSD, FreeBSD)
4545
# bsdi - BSD/OS 2.0 and 2.01
46+
# bsdi_2_1 - BSD/OS 2.1
4647
#aix-IBM on AIX 3.2.5
4748
#irix5-SGI MIPS on IRIX 5.3
4849
# Some hooks are provided for

‎src/backend/bootstrap/bootstrap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.2 1996/07/15 19:21:59 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.3 1996/07/16 07:12:27 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -187,7 +187,7 @@ typedef void (*sig_func)();
187187
*error handling / abort routines
188188
* ----------------
189189
*/
190-
#if !defined(PORTNAME_bsdi)
190+
#if !defined(PORTNAME_bsdi)&& !defined(PORTNAME_bsdi_2_1)
191191
voiderr()
192192
{
193193
Warnings++;

‎src/backend/optimizer/path/costsize.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.1.1.1 1996/07/09 06:21:35 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.2 1996/07/16 07:12:39 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -17,7 +17,7 @@
1717
#include<limits.h>
1818
#defineMAXINT INT_MAX
1919
#else
20-
# if defined(PORTNAME_BSD44_derived)|| defined(PORTNAME_bsdi)
20+
# if defined(PORTNAME_BSD44_derived)|| defined(PORTNAME_bsdi)|| defined(PORTNAME_bsdi_2_1)
2121
# include<machine/limits.h>
2222
# defineMAXINTINT_MAX
2323
# else
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#-------------------------------------------------------------------------
2+
#
3+
# Makefile.inc--
4+
# Makefile for port/bsdi_2_1
5+
#
6+
# NOTES
7+
# The BSD/OS port is included here by courtesy of Kurt Lidl.
8+
#
9+
# (5) 1994, Kurt Lidl, lidl@pix.com
10+
#
11+
#-------------------------------------------------------------------------
12+
13+
CFLAGS+=-DUSE_POSIX_TIME -DNEED_CBRT
14+
LDADD+= -ldl -lipc

‎src/backend/port/bsdi_2_1/machine.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*-------------------------------------------------------------------------
2+
*
3+
* machine.h--
4+
*
5+
*
6+
*
7+
* Copyright (c) 1994, Regents of the University of California
8+
*
9+
* machine.h,v 1.1.1.1 1994/11/07 05:19:37 andrew Exp
10+
*
11+
*-------------------------------------------------------------------------
12+
*/
13+
#ifndefMACHINE_H
14+
#defineMACHINE_H
15+
16+
#defineBLCKSZ8192
17+
18+
#endif
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*-------------------------------------------------------------------------
2+
*
3+
* port-protos.h--
4+
* port-specific prototypes for SunOS 4
5+
*
6+
*
7+
* Copyright (c) 1994, Regents of the University of California
8+
*
9+
* port-protos.h,v 1.2 1995/05/25 22:51:03 andrew Exp
10+
*
11+
*-------------------------------------------------------------------------
12+
*/
13+
#ifndefPORT_PROTOS_H
14+
#definePORT_PROTOS_H
15+
16+
#include"fmgr.h"/* for func_ptr */
17+
#include"utils/dynamic_loader.h"
18+
19+
/* dynloader.c */
20+
21+
#definepg_dlopen(f)dlopen(f, 1)
22+
#definepg_dlsymdlsym
23+
#definepg_dlclosedlclose
24+
#definepg_dlerrordlerror
25+
26+
/* port.c */
27+
28+
#endif/* PORT_PROTOS_H */

‎src/backend/port/bsdi_2_1/port.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/*-------------------------------------------------------------------------
2+
*
3+
* port.c--
4+
* Linux-specific routines
5+
*
6+
* Copyright (c) 1994, Regents of the University of California
7+
*
8+
*
9+
* IDENTIFICATION
10+
* /usr/local/devel/pglite/cvs/src/backend/port/linux/port.c,v 1.1.1.1 1994/11/07 05:19:38 andrew Exp
11+
*
12+
*-------------------------------------------------------------------------
13+
*/

‎src/backend/postmaster/postmaster.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.1.1.1 1996/07/09 06:21:49 scrappy Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.2 1996/07/16 07:13:07 scrappy Exp $
1414
*
1515
* NOTES
1616
*
@@ -49,7 +49,7 @@
4949
#defineMAXINT INT_MAX
5050
#else
5151
#include<netdb.h>/* for MAXHOSTNAMELEN on some */
52-
# if defined(PORTNAME_BSD44_derived)|| defined(PORTNAME_bsdi)
52+
# if defined(PORTNAME_BSD44_derived)|| defined(PORTNAME_bsdi)|| defined(PORTNAME_bsdi_2_1)
5353
# include<machine/limits.h>
5454
# defineMAXINTINT_MAX
5555
# else

‎src/backend/storage/ipc/s_lock.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.2 1996/07/1606:53:41 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.3 1996/07/1607:13:16 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -381,7 +381,8 @@ S_INIT_LOCK(unsigned char *addr)
381381
* Linux and friends
382382
*/
383383

384-
#if defined(PORTNAME_linux)|| defined(PORTNAME_BSD44_derived)|| defined(PORTNAME_bsdi)
384+
#if defined(PORTNAME_linux)|| defined(PORTNAME_BSD44_derived)|| defined(PORTNAME_bsdi)|| defined(PORTNAME_bsdi_2_1)
385+
385386

386387
int
387388
tas(slock_t*m)
@@ -410,7 +411,7 @@ S_INIT_LOCK(slock_t *lock)
410411
S_UNLOCK(lock);
411412
}
412413

413-
#endif/* PORTNAME_linux || PORTNAME_BSD44_derived */
414+
#endif/* PORTNAME_linux || PORTNAME_BSD44_derived|| PORTNAME_bsdi || PORTNAME_bsdi_2_1*/
414415

415416

416417
#endif/* HAS_TEST_AND_SET */

‎src/backend/utils/Gen_fmgrtab.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.1.1.1 1996/07/09 06:22:00 scrappy Exp $
11+
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.2 1996/07/16 07:13:25 scrappy Exp $
1212
#
1313
# NOTES
1414
# Passes any -D options on to cpp prior to generating the list
@@ -81,7 +81,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
8181
*
8282
* Copyright (c) 1994, Regents of the University of California
8383
*
84-
*$Id: Gen_fmgrtab.sh,v 1.1.1.1 1996/07/09 06:22:00 scrappy Exp $
84+
*$Id: Gen_fmgrtab.sh,v 1.2 1996/07/16 07:13:25 scrappy Exp $
8585
*
8686
* NOTES
8787
*******************************
@@ -175,7 +175,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
175175
*
176176
*
177177
* IDENTIFICATION
178-
*$Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.1.1.1 1996/07/09 06:22:00 scrappy Exp $
178+
*$Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.2 1996/07/16 07:13:25 scrappy Exp $
179179
*
180180
* NOTES
181181
*
@@ -195,12 +195,12 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
195195
#ifdef WIN32
196196
#include <limits.h>
197197
#else
198-
# if defined(PORTNAME_BSD44_derived) || defined(PORTNAME_bsdi)
198+
# if defined(PORTNAME_BSD44_derived) || defined(PORTNAME_bsdi) || defined(PORTNAME_bsdi_2_1)
199199
# include <machine/limits.h>
200200
# define MAXINTINT_MAX
201201
# else
202202
# include <values.h> /* for MAXINT */
203-
# endif /* PORTNAME_BSD44_derived || PORTNAME_bsdi */
203+
# endif /* PORTNAME_BSD44_derived || PORTNAME_bsdi|| PORTNAME_bsdi_2_1*/
204204
#endif /* WIN32 */
205205
206206
#include "utils/fmgrtab.h"

‎src/backend/utils/adt/misc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.1.1.1 1996/07/09 06:22:04 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.2 1996/07/16 07:13:33 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -18,7 +18,7 @@
1818
#include"utils/builtins.h"
1919

2020
#if !defined(PORTNAME_linux)&& !defined(PORTNAME_BSD44_derived)&& \
21-
!defined(PORTNAME_irix5)&& !defined(PORTNAME_bsdi)&& !defined(PORTNAME_aix)
21+
!defined(PORTNAME_irix5)&& !defined(PORTNAME_bsdi)&& !defined(PORTNAME_bsdi_2_1)&& !defined(PORTNAME_aix)
2222
externintrandom();
2323
externintsrandom(unsigned);
2424
#endif

‎src/backend/utils/adt/numutils.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.1.1.1 1996/07/09 06:22:05 scrappy Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.2 1996/07/16 07:13:35 scrappy Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -132,7 +132,7 @@ ltoa(int32 l, char *a)
132132
int
133133
ftoa(doublevalue,char*ascii,intwidth,intprec1,charformat)
134134
{
135-
#if defined(PORTNAME_BSD44_derived)|| defined(PORTNAME_bsdi)
135+
#if defined(PORTNAME_BSD44_derived)|| defined(PORTNAME_bsdi)|| defined(PORTNAME_bsdi_2_1)
136136
charout[256];
137137
charfmt[256];
138138
intret;

‎src/backend/utils/error/elog.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.1.1.1 1996/07/09 06:22:07 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.2 1996/07/16 07:13:47 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -48,7 +48,7 @@ elog(int lev, char *fmt, ... )
4848
charbuf[ELOG_MAXLEN],line[ELOG_MAXLEN];
4949
registerchar*bp,*cp;
5050
externinterrno,sys_nerr;
51-
#if !defined(PORTNAME_BSD44_derived)&& !defined(PORTNAME_bsdi)
51+
#if !defined(PORTNAME_BSD44_derived)&& !defined(PORTNAME_bsdi)&& !defined(PORTNAME_bsdi_2_1)
5252
externchar*sys_errlist[];
5353
#endif/* !PORTNAME_BSD44_derived */
5454
#ifndefPG_STANDALONE

‎src/backend/utils/error/exc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.1.1.1 1996/07/09 06:22:07 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.2 1996/07/16 07:13:49 scrappy Exp $
1111
*
1212
* NOTE
1313
* XXX this code needs improvement--check for state violations and
@@ -90,7 +90,7 @@ ExcPrint(Exception *excP,
9090
{
9191
externinterrno;
9292
externintsys_nerr;
93-
#if !defined(PORTNAME_BSD44_derived)&& !defined(PORTNAME_bsdi)
93+
#if !defined(PORTNAME_BSD44_derived)&& !defined(PORTNAME_bsdi)&& !defined(PORTNAME_bsdi_2_1)
9494
externchar*sys_errlist[];
9595
#endif/* !PORTNAME_BSD44_derived */
9696

‎src/mk/port/postgres.mk.bsdi_2_1

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#-------------------------------------------------------------------------
2+
#
3+
# postgres.mk.bsdi--
4+
# Intel x86/BSDi v2.0 specific rules and variables
5+
#
6+
# for questions about the BSD/OS port, contact Kurt Lidl (lidl@pix.com)
7+
#
8+
# Copyright (c) 1994-5, Regents of the University of California
9+
#
10+
# NOTE
11+
# you may remove lines that start with ## which are general comments
12+
#-------------------------------------------------------------------------
13+
ifndef MK_PORT
14+
MK_PORT=bsdi_2_1
15+
16+
# cc is gcc v1.42
17+
# gcc is gcc v2.6.3
18+
CC=gcc
19+
20+
RANLIB=ranlib
21+
INSTALL=install
22+
LEX=lex
23+
AROPT=cq
24+
25+
# use the regex library
26+
USE_REGEX = 1
27+
28+
LDADD_BE= -ldl -lcompat
29+
30+
#
31+
# for postgres.user.mk
32+
#
33+
SLSUFF=.o
34+
35+
#
36+
# for postgres.mk
37+
#
38+
CFLAGS_OPT=-O -DUSE_POSIX_SIGNALS # -O2
39+
40+
endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp