Skip to content

Commit 3558ec9

Browse files
vbwagnervbwagner
committed
Merge current version
2 parents b8eb09c + f92195f commit 3558ec9

File tree

786 files changed

+99566
-52205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

786 files changed

+99566
-52205
lines changed

‎COPYRIGHT

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
PostgreSQL Database Management System
22
(formerly known as Postgres, then as Postgres95)
33

4+
Portions Copyright (c) 2015-2017, Postgres Professional company
5+
46
Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
57

68
Portions Copyright (c) 1994, The Regents of the University of California
79

810
Permission to use, copy, modify, and distribute this software and its
9-
documentation for any purpose, without fee, and without a written agreement
11+
documentation for the purposes of testing and studying its features and performance,
12+
as well as educational purposes, without fee, and without a written agreement
1013
is hereby granted, provided that the above copyright notice and this
11-
paragraph and the following two paragraphs appear in all copies.
14+
paragraph and the following two paragraphs appear in all copies. Using this
15+
software and its documentation for other purposes, including its packaging with
16+
other software, copying, modification and redistribution, requires
17+
a special license from Postgres Professional.
1218

1319
IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
1420
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING

‎GNUmakefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ $(distdir).tar: distdir
9595
distdir-location:
9696
@echo $(distdir)
9797

98-
distdir:
98+
distdir: src/include/commit_id.h
9999
rm -rf $(distdir)* $(dummy)
100100
for x in `cd $(top_srcdir) && find . \( -name CVS -prune \) -o \( -name .git -prune \) -o -print`; do \
101101
file=`expr X$$x : 'X\./\(.*\)'`; \

‎HISTORY

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
Release notes for all versions of PostgreSQL can be found on-line at
2-
http://www.postgresql.org/docs/current/static/release.html
3-
4-
Distribution file sets include release notes for their version and preceding
5-
versions. Visit the file doc/src/sgml/html/release.html in an HTML browser.
1+
Release notes for all versions of Postgres Pro Standard can be found on-line at
2+
https://postgrespro.com/docs/postgrespro/9.6/release.html

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ all check install installdirs installcheck installcheck-parallel uninstall clean
2929
\
3030
if [ x"$${GMAKE+set}" = xset ]; then \
3131
echo "Using GNU make found at $${GMAKE}"; \
32+
unset MAKEFLAGS; unset MAKELEVEL; \
3233
$${GMAKE} $@ ; \
3334
else \
3435
echo "You must use GNU make to build PostgreSQL." ; \

‎README

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
1-
PostgreSQL Database Management System
2-
=====================================
1+
Postgres Pro Standard Database Management System
2+
================================================
33

4-
This directory contains the source code distribution of the PostgreSQL
5-
database management system.
4+
This directory contains the source code distribution of the
5+
Postgres Pro Standard database management system.
66

7-
PostgreSQL is an advanced object-relational database management system
8-
that supports an extended subset of the SQL standard, including
9-
transactions, foreign keys, subqueries, triggers, user-defined types
10-
and functions. This distribution also contains C language bindings.
7+
Postgres Pro Standard is an advanced object-relational database
8+
management system that supports an extended subset of the SQL standard,
9+
including transactions, foreign keys, subqueries, triggers,
10+
user-defined types and functions. This distribution also
11+
contains C language bindings.
1112

12-
PostgreSQL has many language interfaces, many of which are listed here:
13-
14-
http://www.postgresql.org/download
15-
16-
See the file INSTALL for instructions on how to build and install
17-
PostgreSQL. That file also lists supported operating systems and
18-
hardware platforms and contains information regarding any other
19-
software packages that are required to build or run the PostgreSQL
20-
system. Copyright and license information can be found in the
21-
file COPYRIGHT. A comprehensive documentation set is included in this
22-
distribution; it can be read as described in the installation
23-
instructions.
13+
Copyright and license information can be found in the
14+
file COPYRIGHT. A comprehensive documentation set is included in this
15+
distribution.
2416

2517
The latest version of this software may be obtained at
26-
http://www.postgresql.org/download/. For more information look at our
27-
web site located at http://www.postgresql.org/.
18+
https://postgrespro.com/products/download. For more information look at our
19+
web site located at http://postgrespro.com/.

‎README.git

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ git and so will not be present if you are using a git checkout.
66

77
If you are using a git checkout, you can view the most recent installation
88
instructions at:
9-
http://www.postgresql.org/docs/devel/static/installation.html
9+
https://www.postgresql.org/docs/devel/static/installation.html
1010

1111
Users compiling from git will also need compatible versions of Bison, Flex,
1212
and Perl, as discussed in the install documentation. These programs are not

‎config/perl.m4

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,33 @@ AC_DEFUN([PGAC_CHECK_PERL_CONFIGS],
4949
[m4_foreach([pgac_item], [$1], [PGAC_CHECK_PERL_CONFIG(pgac_item)])])
5050

5151

52+
# PGAC_CHECK_PERL_EMBED_CCFLAGS
53+
# -----------------------------
54+
# We selectively extract stuff from $Config{ccflags}. We don't really need
55+
# anything except -D switches, and other sorts of compiler switches can
56+
# actively break things if Perl was compiled with a different compiler.
57+
# Moreover, although Perl likes to put stuff like -D_LARGEFILE_SOURCE and
58+
# -D_FILE_OFFSET_BITS=64 here, it would be fatal to try to compile PL/Perl
59+
# to a different libc ABI than core Postgres uses. The available information
60+
# says that all the symbols that affect Perl's own ABI begin with letters,
61+
# so it should be sufficient to adopt -D switches for symbols not beginning
62+
# with underscore. An exception is that we need to let through
63+
# -D_USE_32BIT_TIME_T if it's present. (We probably could restrict that to
64+
# only get through on Windows, but for the moment we let it through always.)
65+
# For debugging purposes, let's have the configure output report the raw
66+
# ccflags value as well as the set of flags we chose to adopt.
67+
AC_DEFUN([PGAC_CHECK_PERL_EMBED_CCFLAGS],
68+
[AC_REQUIRE([PGAC_PATH_PERL])
69+
AC_MSG_CHECKING([for CFLAGS recommended by Perl])
70+
perl_ccflags=`$PERL -MConfig -e ['print $Config{ccflags}']`
71+
AC_MSG_RESULT([$perl_ccflags])
72+
AC_MSG_CHECKING([for CFLAGS to compile embedded Perl])
73+
perl_embed_ccflags=`$PERL -MConfig -e ['foreach $f (split(" ",$Config{ccflags})) {print $f, " " if ($f =~ /^-D[^_]/ || $f =~ /^-D_USE_32BIT_TIME_T/)}']`
74+
AC_SUBST(perl_embed_ccflags)dnl
75+
AC_MSG_RESULT([$perl_embed_ccflags])
76+
])# PGAC_CHECK_PERL_EMBED_CCFLAGS
77+
78+
5279
# PGAC_CHECK_PERL_EMBED_LDFLAGS
5380
# -----------------------------
5481
# We are after Embed's ldopts, but without the subset mentioned in

0 commit comments

Comments
 (0)