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

Commit3a4c288

Browse files
committed
Removal of bsdi_2_1 port.
1 parent727c840 commit3a4c288

File tree

10 files changed

+44
-162
lines changed

10 files changed

+44
-162
lines changed

‎src/Makefile.global

Lines changed: 21 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
X=$(shell sleep 4)
12
#----------------------------------------------------------------------------
23
#
34
# Makefile.global--
@@ -7,7 +8,7 @@
78
#
89
#
910
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.44 1996/10/31 05:53:10 momjian Exp $
11+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.45 1996/11/01 01:45:52 momjian Exp $
1112
#
1213
# NOTES
1314
# This is seen by any Makefiles that include mk/postgres.mk. To
@@ -46,8 +47,7 @@
4647
#linux-Intel x86 on Linux 1.2 and Linux ELF
4748
#(For non-ELF Linux, see LINUX_ELF below).
4849
#BSD44_derived-OSs derived from 4.4-lite BSD (NetBSD, FreeBSD)
49-
# bsdi - BSD/OS 2.0 and 2.01
50-
# bsdi_2_1 - BSD/OS 2.1
50+
# bsdi - BSD/OS 2.0, 2.01, 2.1
5151
#aix-IBM on AIX 3.2.5
5252
#irix5-SGI MIPS on IRIX 5.3
5353
#dgux - DG/UX 5.4R3.10
@@ -423,55 +423,38 @@ endif
423423
ifeq ($(PORTNAME), bsdi)
424424
MK_PORT=bsdi
425425

426-
# cc is gcc v1.42
427-
# gcc is gcc v2.6.3
428426
CC=gcc
429427

430-
LEX=flex
431-
AROPT=cq
432-
433-
# use the regex library
434-
USE_REGEX = 1
435-
436-
LDADD_BE= -ldld -lcompat
437-
438-
#
439-
# for postgres.user.mk
440-
#
441-
SLSUFF=.o
442-
443-
#
444-
# for postgres.mk
445-
#
446-
CFLAGS_OPT=-g -DUSE_POSIX_SIGNALS # -O2
447-
428+
PRE_BSDI_2_1=N
429+
ifeq ($(shell uname -r), 2.0)
430+
PRE_BSDI_2_1=Y
431+
endif
432+
ifeq ($(shell uname -r), 2.01)
433+
PRE_BSDI_2_1=Y
448434
endif
449435

450-
#--------------------------------------------------------------------------
451-
452-
ifeq ($(PORTNAME), bsdi_2_1)
453-
MK_PORT=bsdi_2_1
454-
436+
ifeq ($(PRE_BSDI_2_1), N)
455437
# cc is gcc v1.42
456438
# gcc is gcc v2.7.2
457-
CC=gcc
439+
LEX=lex
440+
LD_ADD+=-ltermcap
441+
CFLAGS_BE = -DPRE_BSDI_2_1
442+
else
443+
# cc is gcc v1.42
444+
# gcc is gcc v2.6.3
445+
LEX=flex
446+
# use the regex library
447+
USE_REGEX = 1
448+
LDADD_BE = -ldld -lcompat
449+
endif
458450

459-
LEX=lex
460451
AROPT=cq
461452

462-
LD_ADD+=-ltermcap
463-
464453
#
465454
# for postgres.user.mk
466455
#
467456
SLSUFF=.o
468457

469-
#
470-
# for postgres.mk
471-
#
472-
CFLAGS_OPT=-O2 -m486
473-
CFLAGS_BE = -DUSE_POSIX_SIGNALS
474-
475458
endif
476459

477460
#--------------------------------------------------------------------------

‎src/backend/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#
3535
#
3636
# IDENTIFICATION
37-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.11 1996/10/31 07:25:15 scrappy Exp $
37+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.12 1996/11/01 01:46:00 momjian Exp $
3838
#
3939
#-------------------------------------------------------------------------
4040

@@ -64,11 +64,11 @@ LDADD+= -lln
6464
endif
6565

6666
ifeq ($(PORTNAME), bsdi)
67-
LDADD+= -ldld -lipc
68-
endif
69-
70-
ifeq ($(PORTNAME), bsdi_2_1)
71-
LDADD+= -ldl -lipc
67+
ifeq ($(PRE_BSDI_2_1), N)
68+
LDADD+= -ldl -lipc
69+
else
70+
LDADD+= -ldld -lipc
71+
endif
7272
endif
7373

7474
ifeq ($(PORTNAME), hpux)

‎src/backend/port/bsdi/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for port/bsdi
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.1 1996/10/27 09:49:44 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.2 1996/11/01 01:46:21 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -17,7 +17,7 @@ INCLUDE_OPT = -I../.. \
1717

1818
CFLAGS+=$(INCLUDE_OPT)
1919

20-
OBJS = dynloader.o
20+
OBJS = dynloader.o port.o
2121

2222
all: SUBSYS.o
2323

‎src/backend/port/bsdi/port-protos.h

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@
1818

1919
/* dynloader.c */
2020

21-
#ifndefLINUX_ELF
22-
#definepg_dlsym(handle,funcname)((func_ptr) dld_get_func((funcname)))
23-
#definepg_dlclose(handle)({ dld_unlink_by_file(handle, 1); free(handle); })
21+
#include<sys/param.h>
22+
23+
#if_BSDI_VERSION >=199510
24+
# include<dlfcn.h>
25+
# definepg_dlopen(f)dlopen(f, 1)
26+
# definepg_dlsymdlsym
27+
# definepg_dlclosedlclose
28+
# definepg_dlerrordlerror
2429
#else
25-
#definepg_dlopen(f)dlopen(f, 1)
26-
#definepg_dlsymdlsym
27-
#definepg_dlclosedlclose
28-
#definepg_dlerrordlerror
30+
# definepg_dlsym(handle,funcname)((func_ptr) dld_get_func((funcname)))
31+
# definepg_dlclose(handle)({ dld_unlink_by_file(handle, 1); free(handle); })
2932
#endif
3033

3134
/* port.c */

‎src/backend/port/bsdi_2_1/Makefile

Lines changed: 0 additions & 36 deletions
This file was deleted.

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

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/backend/port/bsdi_2_1/port-protos.h

Lines changed: 0 additions & 29 deletions
This file was deleted.

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

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/bin/psql/Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.6 1996/08/21 04:06:01 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.7 1996/11/01 01:46:55 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -47,9 +47,6 @@ ifeq ($(USE_READLINE), true)
4747
ifeq ($(PORTNAME), bsdi)
4848
LD_ADD += -ltermcap
4949
else
50-
ifeq ($(PORTNAME), bsdi_2_1)
51-
LD_ADD += -ltermcap
52-
else
5350
ifeq ($(PORTNAME), BSD44_derived)
5451
LD_ADD += -ltermcap
5552
endif
@@ -58,7 +55,6 @@ ifeq ($(USE_READLINE), true)
5855
endif
5956
endif
6057
endif
61-
endif
6258
else
6359
CFLAGS += -DNOREADLINE
6460
endif

‎src/include/config.h

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,13 @@
102102
#endif/* WIN32 */
103103

104104
#if defined(BSD44_derived)|| \
105-
defined(bsdi_2_1)
106-
# defineUSE_LIMITS_H
107-
# defineUSE_POSIX_TIME
108-
# defineNEED_CBRT
109-
#endif
110-
111-
#if defined(bsdi)
112-
# defineNEED_UNION_SEMUN
105+
defined(bsdi)
113106
# defineUSE_LIMITS_H
114107
# defineUSE_POSIX_TIME
115108
# defineNEED_CBRT
109+
# ifdefPRE_BSDI_2_1
110+
# defineNEED_UNION_SEMUN
111+
# endif
116112
#endif
117113

118114
#if defined(aix)

0 commit comments

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