Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 44f9021

Browse files
bmomjianbmomjian
committed
Remove BEOS port.
1 parent 6f84b2d commit 44f9021

File tree

29 files changed

+28
-1253
lines changed

29 files changed

+28
-1253
lines changed

‎configure

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1496,7 +1496,6 @@ else
14961496

14971497
case $host_os in
14981498
aix*) template=aix ;;
1499-
beos*) template=beos ;;
15001499
bsdi*) template=bsdi ;;
15011500
cygwin*) template=cygwin ;;
15021501
darwin*) template=darwin ;;
@@ -6166,84 +6165,6 @@ if test "$ac_cv_search_crypt" != no; then
61666165

61676166
fi
61686167

6169-
# BeOS:
6170-
if test "$PORTNAME" = "beos"
6171-
then
6172-
6173-
echo "$as_me:$LINENO: checking for __inet_ntoa in -lbind" >&5
6174-
echo $ECHO_N "checking for __inet_ntoa in -lbind... $ECHO_C" >&6
6175-
if test "${ac_cv_lib_bind___inet_ntoa+set}" = set; then
6176-
echo $ECHO_N "(cached) $ECHO_C" >&6
6177-
else
6178-
ac_check_lib_save_LIBS=$LIBS
6179-
LIBS="-lbind $LIBS"
6180-
cat >conftest.$ac_ext <<_ACEOF
6181-
/* confdefs.h. */
6182-
_ACEOF
6183-
cat confdefs.h >>conftest.$ac_ext
6184-
cat >>conftest.$ac_ext <<_ACEOF
6185-
/* end confdefs.h. */
6186-
6187-
/* Override any gcc2 internal prototype to avoid an error. */
6188-
#ifdef __cplusplus
6189-
extern "C"
6190-
#endif
6191-
/* We use char because int might match the return type of a gcc2
6192-
builtin and then its argument prototype would still apply. */
6193-
char __inet_ntoa ();
6194-
int
6195-
main ()
6196-
{
6197-
__inet_ntoa ();
6198-
;
6199-
return 0;
6200-
}
6201-
_ACEOF
6202-
rm -f conftest.$ac_objext conftest$ac_exeext
6203-
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6204-
(eval $ac_link) 2>conftest.er1
6205-
ac_status=$?
6206-
grep -v '^ *+' conftest.er1 >conftest.err
6207-
rm -f conftest.er1
6208-
cat conftest.err >&5
6209-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
6210-
(exit $ac_status); } &&
6211-
{ ac_try='test -z "$ac_c_werror_flag"
6212-
|| test ! -s conftest.err'
6213-
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6214-
(eval $ac_try) 2>&5
6215-
ac_status=$?
6216-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
6217-
(exit $ac_status); }; } &&
6218-
{ ac_try='test -s conftest$ac_exeext'
6219-
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6220-
(eval $ac_try) 2>&5
6221-
ac_status=$?
6222-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
6223-
(exit $ac_status); }; }; then
6224-
ac_cv_lib_bind___inet_ntoa=yes
6225-
else
6226-
echo "$as_me: failed program was:" >&5
6227-
sed 's/^/| /' conftest.$ac_ext >&5
6228-
6229-
ac_cv_lib_bind___inet_ntoa=no
6230-
fi
6231-
rm -f conftest.err conftest.$ac_objext \
6232-
conftest$ac_exeext conftest.$ac_ext
6233-
LIBS=$ac_check_lib_save_LIBS
6234-
fi
6235-
echo "$as_me:$LINENO: result: $ac_cv_lib_bind___inet_ntoa" >&5
6236-
echo "${ECHO_T}$ac_cv_lib_bind___inet_ntoa" >&6
6237-
if test $ac_cv_lib_bind___inet_ntoa = yes; then
6238-
cat >>confdefs.h <<_ACEOF
6239-
#define HAVE_LIBBIND 1
6240-
_ACEOF
6241-
6242-
LIBS="-lbind $LIBS"
6243-
6244-
fi
6245-
6246-
fi
62476168
# Solaris:
62486169
echo "$as_me:$LINENO: checking for library containing fdatasync" >&5
62496170
echo $ECHO_N "checking for library containing fdatasync... $ECHO_C" >&6

‎configure.in

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.440 2006/01/05 01:56:28 momjian Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.441 2006/01/05 03:01:32 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -49,7 +49,6 @@ PGAC_ARG_REQ(with, template, [],
4949

5050
case $host_os in
5151
aix*) template=aix ;;
52-
beos*) template=beos ;;
5352
bsdi*) template=bsdi ;;
5453
cygwin*) template=cygwin ;;
5554
darwin*) template=darwin ;;
@@ -614,11 +613,6 @@ AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt])
614613
# QNX:
615614
AC_CHECK_LIB(unix, main)
616615
AC_SEARCH_LIBS(crypt, crypt)
617-
# BeOS:
618-
if test "$PORTNAME" = "beos"
619-
then
620-
AC_CHECK_LIB(bind, __inet_ntoa)
621-
fi
622616
# Solaris:
623617
AC_SEARCH_LIBS(fdatasync, [rt posix4])
624618
# Cygwin:

‎doc/src/sgml/installation.sgml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.251 2006/01/05 01:56:28 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.252 2006/01/05 03:01:32 momjian Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -1995,13 +1995,6 @@ kill `cat /usr/local/pgsql/data/postmaster.pid`
19951995
</thead>
19961996

19971997
<tbody>
1998-
<row>
1999-
<entry><systemitem class="osname">BeOS</></entry>
2000-
<entry><systemitem>x86</></entry>
2001-
<entry>7.2</entry>
2002-
<entry>Cyril Velter (<email>cyril.velter@libertysurf.fr</email>), 2001-11-29</entry>
2003-
<entry>needs updates to semaphore code</entry>
2004-
</row>
20051998
<row>
20061999
<entry><systemitem class="osname">Linux</></entry>
20072000
<entry><systemitem>PlayStation 2</></entry>

‎doc/src/sgml/runtime.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.360 2006/01/05 01:56:28 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.361 2006/01/05 03:01:33 momjian Exp $
33
-->
44

55
<chapter Id="runtime">
@@ -480,9 +480,9 @@ psql: could not connect to server: No such file or directory
480480
relevant for <productname>PostgreSQL</>). Almost all modern
481481
operating systems provide these features, but not all of them have
482482
them turned on or sufficiently sized by default, especially systems
483-
with BSD heritage. (For the <systemitem class="osname">Windows</> and
484-
<systemitem class="osname">BeOS</> ports, <productname>PostgreSQL</>
485-
provides its own replacement implementation of these facilities.)
483+
with BSD heritage. (For the <systemitem class="osname">Windows</>
484+
port, <productname>PostgreSQL</> provides its own replacement
485+
implementation of these facilities.)
486486
</para>
487487

488488
<para>

‎src/Makefile.shlib

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1998, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.101 2005/12/30 21:43:41 momjian Exp $
9+
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.102 2006/01/05 03:01:34 momjian Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -246,12 +246,6 @@ ifeq ($(PORTNAME), win32)
246246
haslibarule = yes
247247
endif
248248

249-
ifeq ($(PORTNAME), beos)
250-
shlib = lib$(NAME)$(DLSUFFIX)
251-
LINK.shared = $(LD) -nostart
252-
SHLIB_LINK += -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86
253-
endif
254-
255249
ifeq ($(enable_rpath), yes)
256250
SHLIB_LINK += $(rpath)
257251
endif
@@ -290,7 +284,6 @@ ifeq ($(enable_shared), yes)
290284

291285
ifneq ($(PORTNAME), win32)
292286
ifneq ($(PORTNAME), cygwin)
293-
ifneq ($(PORTNAME), beos)
294287
ifneq ($(PORTNAME), aix)
295288

296289
# Normal case
@@ -316,15 +309,6 @@ $(shlib): lib$(NAME).a
316309

317310
endif # PORTNAME == aix
318311

319-
else # PORTNAME == beos
320-
321-
# BEOS case
322-
$(shlib): $(OBJS)
323-
ln -fs $(top_srcdir)/src/backend/postgres _APP_
324-
$(CC) -Xlinker -soname=$@ $(LDFLAGS_SL) -o $@ _APP_ $(OBJS) $(SHLIB_LINK)
325-
326-
endif # PORTNAME == beos
327-
328312
else # PORTNAME == cygwin
329313

330314
# Cygwin case

‎src/backend/main/main.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
*
1515
* IDENTIFICATION
16-
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.98 2005/12/28 23:22:51 tgl Exp $
16+
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.99 2006/01/05 03:01:34 momjian Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -118,11 +118,6 @@ main(int argc, char *argv[])
118118
}
119119
#endif
120120

121-
#ifdef __BEOS__
122-
/* BeOS-specific actions on startup */
123-
beos_startup(argc, argv);
124-
#endif
125-
126121
/*
127122
* Not-quite-so-platform-specific startup environment checks. Still best
128123
* to minimize these.
@@ -205,13 +200,8 @@ main(int argc, char *argv[])
205200
strcmp(argv[1], "-V") == 0)))
206201
{
207202
#ifndef WIN32
208-
#ifndef __BEOS__
209-
210203
/*
211204
* Make sure we are not running as root.
212-
*
213-
* BeOS currently runs everything as root :-(, so this check must be
214-
* temporarily disabled there...
215205
*/
216206
if (geteuid() == 0)
217207
{
@@ -221,7 +211,6 @@ main(int argc, char *argv[])
221211
"more information on how to properly start the server.\n");
222212
exit(1);
223213
}
224-
#endif /* !__BEOS__ */
225214

226215
/*
227216
* Also make sure that real and effective uids are the same. Executing

‎src/backend/port/Makefile

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# be converted to Method 2.
1414
#
1515
# IDENTIFICATION
16-
# $PostgreSQL: pgsql/src/backend/port/Makefile,v 1.21 2006/01/05 01:56:29 momjian Exp $
16+
# $PostgreSQL: pgsql/src/backend/port/Makefile,v 1.22 2006/01/05 03:01:35 momjian Exp $
1717
#
1818
#-------------------------------------------------------------------------
1919

@@ -25,9 +25,6 @@ OBJS+=dynloader.o pg_sema.o pg_shmem.o
2525

2626
OBJS+=$(TAS)
2727

28-
ifeq ($(PORTNAME), beos)
29-
OBJS+=beos/SUBSYS.o
30-
endif
3128
ifeq ($(PORTNAME), darwin)
3229
OBJS+=darwin/SUBSYS.o
3330
endif
@@ -40,11 +37,6 @@ all: SUBSYS.o
4037
SUBSYS.o: $(OBJS)
4138
$(LD) $(LDREL) $(LDOUT) $@ $^
4239

43-
beos/SUBSYS.o: beos.dir
44-
45-
beos.dir:
46-
$(MAKE) -C beos all
47-
4840
darwin/SUBSYS.o: darwin.dir
4941

5042
darwin.dir:
@@ -64,7 +56,6 @@ ipc_test: ipc_test.o pg_sema.o pg_shmem.o
6456

6557
distclean clean:
6658
rm -f SUBSYS.o $(OBJS) ipc_test ipc_test.o
67-
$(MAKE) -C beos clean
6859
$(MAKE) -C darwin clean
6960
$(MAKE) -C win32 clean
7061

‎src/backend/port/beos/Makefile

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

0 commit comments

Comments
 (0)