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

Commit ebcaa5f

Browse files
committed
Remove BSD/OS (BSDi) port. There are no known users upgrading to
Postgres 9.2, and perhaps no existing users either.
1 parent 7490c48 commit ebcaa5f

File tree

15 files changed

+13
-290
lines changed

15 files changed

+13
-290
lines changed

configure

+2-3
Original file line numberDiff line numberDiff line change
@@ -2190,7 +2190,6 @@ else
21902190

21912191
case $host_os in
21922192
aix*) template=aix ;;
2193-
bsdi*) template=bsdi ;;
21942193
cygwin*) template=cygwin ;;
21952194
darwin*) template=darwin ;;
21962195
dragonfly*) template=netbsd ;;
@@ -19489,9 +19488,9 @@ done
1948919488

1949019489

1949119490
case $host_os in
19492-
# BSD/OS & NetBSD use a custom fseeko/ftello built on fsetpos/fgetpos
19491+
# NetBSD uses a custom fseeko/ftello built on fsetpos/fgetpos
1949319492
# Mingw uses macros to access Win32 API calls
19494-
bsdi*|netbsd*|mingw*)
19493+
netbsd*|mingw*)
1949519494

1949619495
cat >>confdefs.h <<\_ACEOF
1949719496
#define HAVE_FSEEKO 1

configure.in

+2-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ PGAC_ARG_REQ(with, template, [NAME], [override operating system template],
5555

5656
case $host_os in
5757
aix*) template=aix ;;
58-
bsdi*) template=bsdi ;;
5958
cygwin*) template=cygwin ;;
6059
darwin*) template=darwin ;;
6160
dragonfly*) template=netbsd ;;
@@ -1211,9 +1210,9 @@ AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasync getifaddrs getpeerucred getrlimit mem
12111210

12121211
AC_REPLACE_FUNCS(fseeko)
12131212
case $host_os in
1214-
# BSD/OS & NetBSD use a custom fseeko/ftello built on fsetpos/fgetpos
1213+
# NetBSD uses a custom fseeko/ftello built on fsetpos/fgetpos
12151214
# Mingw uses macros to access Win32 API calls
1216-
bsdi*|netbsd*|mingw*)
1215+
netbsd*|mingw*)
12171216
AC_DEFINE(HAVE_FSEEKO, 1, [Define to 1 because replacement version used.])
12181217
ac_cv_func_fseeko=yes;;
12191218
*)

doc/src/sgml/dfunc.sgml

-18
Original file line numberDiff line numberDiff line change
@@ -55,24 +55,6 @@
5555
-->
5656

5757
<variablelist>
58-
<varlistentry>
59-
<term><systemitem class="osname">BSD/OS</></term>
60-
<indexterm><primary>BSD/OS</><secondary>shared library</></>
61-
<listitem>
62-
<para>
63-
The compiler flag to create <acronym>PIC</acronym> is
64-
<option>-fpic</option>. The linker flag to create shared
65-
libraries is <option>-shared</option>.
66-
<programlisting>
67-
gcc -fpic -c foo.c
68-
ld -shared -o foo.so foo.o
69-
</programlisting>
70-
This is applicable as of version 4.0 of
71-
<systemitem class="osname">BSD/OS</>.
72-
</para>
73-
</listitem>
74-
</varlistentry>
75-
7658
<varlistentry>
7759
<term><systemitem class="osname">FreeBSD</></term>
7860
<indexterm><primary>FreeBSD</><secondary>shared library</></>

doc/src/sgml/installation.sgml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1622,8 +1622,8 @@ PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
16221622
On some systems with shared libraries
16231623
you need to tell the system how to find the newly installed
16241624
shared libraries. The systems on which this is
1625-
<emphasis>not</emphasis> necessary include <systemitem
1626-
class="osname">BSD/OS</>, <systemitem class="osname">FreeBSD</>,
1625+
<emphasis>not</emphasis> necessary include
1626+
<systemitem class="osname">FreeBSD</>,
16271627
<systemitem class="osname">HP-UX</>, <systemitem
16281628
class="osname">IRIX</>, <systemitem class="osname">Linux</>,
16291629
<systemitem class="osname">NetBSD</>, <systemitem
@@ -1682,9 +1682,8 @@ libpq.so.2.1: cannot open shared object file: No such file or directory
16821682
<indexterm>
16831683
<primary>ldconfig</primary>
16841684
</indexterm>
1685-
If you are on <systemitem class="osname">BSD/OS</>
1686-
or <systemitem class="osname">Linux</>, and you have root access you can
1687-
run:
1685+
If you are on <systemitem class="osname">Linux</> and you have root
1686+
access, you can run:
16881687
<programlisting>
16891688
/sbin/ldconfig /usr/local/pgsql/lib
16901689
</programlisting>

doc/src/sgml/runtime.sgml

-41
Original file line numberDiff line numberDiff line change
@@ -741,47 +741,6 @@ psql: could not connect to server: No such file or directory
741741
</listitem>
742742
</varlistentry>
743743

744-
<varlistentry>
745-
<term><systemitem class="osname">BSD/OS</></term>
746-
<indexterm><primary>BSD/OS</><secondary>IPC configuration</></>
747-
<listitem>
748-
<formalpara>
749-
<title>Shared Memory</title>
750-
<para>
751-
By default, only 4 MB of shared memory is supported. Keep in
752-
mind that shared memory is not pageable; it is locked in RAM.
753-
To increase the amount of shared memory supported by your
754-
system, add something like the following to your kernel configuration
755-
file:
756-
<programlisting>
757-
options "SHMALL=8192"
758-
options "SHMMAX=\(SHMALL*PAGE_SIZE\)"
759-
</programlisting>
760-
<varname>SHMALL</> is measured in 4 kB pages, so a value of
761-
1024 represents 4 MB of shared memory. Therefore the above increases
762-
the maximum shared memory area to 32 MB.
763-
For those running 4.3 or later, you will probably also need to increase
764-
<varname>KERNEL_VIRTUAL_MB</> above the default <literal>248</>.
765-
Once all changes have been made, recompile the kernel, and reboot.
766-
</para>
767-
</formalpara>
768-
769-
<formalpara>
770-
<title>Semaphores</title>
771-
<para>
772-
You will probably want to increase the number of semaphores
773-
as well; the default system total of 60 will only allow about
774-
50 <productname>PostgreSQL</productname> connections. Set the
775-
values you want in your kernel configuration file, e.g.:
776-
<programlisting>
777-
options "SEMMNI=40"
778-
options "SEMMNS=240"
779-
</programlisting>
780-
</para>
781-
</formalpara>
782-
</listitem>
783-
</varlistentry>
784-
785744

786745
<varlistentry>
787746
<term><systemitem class="osname">FreeBSD</></term>

src/Makefile.shlib

-13
Original file line numberDiff line numberDiff line change
@@ -157,19 +157,6 @@ ifeq ($(PORTNAME), openbsd)
157157
endif
158158
endif
159159

160-
ifeq ($(PORTNAME), bsdi)
161-
ifeq ($(DLSUFFIX), .so)
162-
LINK.shared = $(COMPILER) -shared
163-
ifdef soname
164-
LINK.shared += -Wl,-x,-soname,$(soname)
165-
endif
166-
SHLIB_LINK += -lc
167-
endif
168-
ifeq ($(DLSUFFIX), .o)
169-
LINK.shared = shlicc -O $(LDREL)
170-
endif
171-
endif
172-
173160
ifeq ($(PORTNAME), freebsd)
174161
ifdef ELF_SYSTEM
175162
ifdef SO_MAJOR_VERSION

src/backend/port/dynloader/bsdi.c

-96
This file was deleted.

src/backend/port/dynloader/bsdi.h

-50
This file was deleted.

src/backend/utils/misc/ps_status.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ bool update_process_title = true;
6464
#define PS_USE_PSTAT
6565
#elif defined(HAVE_PS_STRINGS)
6666
#define PS_USE_PS_STRINGS
67-
#elif (defined(BSD) || defined(__bsdi__) || defined(__hurd__)) && !defined(__darwin__)
67+
#elif (defined(BSD) || defined(__hurd__)) && !defined(__darwin__)
6868
#define PS_USE_CHANGE_ARGV
6969
#elif defined(__linux__) || defined(_AIX) || defined(__sgi) || (defined(sun) && !defined(BSD)) || defined(ultrix) || defined(__ksr__) || defined(__osf__) || defined(__svr5__) || defined(__darwin__)
7070
#define PS_USE_CLOBBER_ARGV

src/include/port.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ extern char *crypt(const char *key, const char *setting);
367367
/* WIN32 handled in port/win32.h */
368368
#ifndef WIN32
369369
#define pgoff_t off_t
370-
#if defined(__bsdi__) || defined(__NetBSD__)
370+
#ifdef __NetBSD__
371371
extern int fseeko(FILE *stream, off_t offset, int whence);
372372
extern off_t ftello(FILE *stream);
373373
#endif

src/include/port/bsdi.h

-3
This file was deleted.

src/makefiles/Makefile.bsdi

-25
This file was deleted.

0 commit comments

Comments
 (0)