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

Commit8d355d7

Browse files
committed
Fix the makefiles to fail cleanly if Perl is needed but not present. This
used to work as intended, but got broken some time ago (a quoted empty stringis not an empty string), and got broken some more by the changes to generateecpg's preproc.y automatically. Given all the unprotected uses of $(PERL)elsewhere, it seems best to make use of the $(missing) script rather thantrying to ensure each such use is protected individually. Also fix variousbits of documentation that omitted to mention Perl as a requirement forbuilding from a CVS pull. Per a complaint from Robert Haas.
1 parentbc00ceb commit8d355d7

File tree

6 files changed

+49
-18
lines changed

6 files changed

+49
-18
lines changed

‎README.CVS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ If you are using CVS, you can view the most recent install instructions at:
88
and the current release notes at:
99
http://developer.postgresql.org/docs/postgres/release.html
1010

11-
Users compiling from CVS will also need compatible versions of Bison and
12-
Flex, as discussed in the install documentation.Bison and Flex are not
11+
Users compiling from CVS will also need compatible versions of Bison, Flex,
12+
and Perl, as discussed in the install documentation.These programs are not
1313
needed when using a tarball, since the files they are needed to build are
14-
already present in the tarball.
14+
already present in the tarball. (On Windows, however, you need Perl anyway.)

‎config/missing

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# $PostgreSQL: pgsql/config/missing,v 1.4 2006/03/11 04:38:28 momjian Exp $
3+
# $PostgreSQL: pgsql/config/missing,v 1.5 2009/06/23 03:46:00 tgl Exp $
44

55
# This is *not* the GNU `missing' script, although it is similar in
66
# concept. You can call it from the makefiles to get consistent
@@ -17,7 +17,7 @@ case $1 in
1717
WARNING:\`$1' is missing on your system. You should only need it
1818
if you changed the file\`$input'; these changes will not take effect.
1919
You can get$1 from a GNU mirror site.
20-
***"
20+
***">&2
2121
echo"touch$output"
2222
touch"$output"
2323
exit 0
@@ -28,8 +28,27 @@ ERROR: \`$1' is missing on your system. It is needed to create the
2828
file\`$output'. You can either get$1 from a GNU mirror site
2929
or download an official distribution of PostgreSQL, which contains
3030
pre-packaged$1 output.
31-
***"
31+
***">&2
3232
exit 1
3333
fi
3434
;;
35+
36+
perl)
37+
# `missing perl'
38+
echo"\
39+
***
40+
ERROR: Perl is missing on your system. It is needed unless you are building
41+
from an unmodified official distribution of PostgreSQL.
42+
***">&2
43+
exit 1
44+
;;
45+
46+
*)
47+
# `missing something-or-other'
48+
echo"\
49+
***
50+
ERROR:\`$1' is missing on your system.
51+
***">&2
52+
exit 1
53+
;;
3554
esac

‎doc/src/sgml/cvs.sgml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/cvs.sgml,v 1.50 2008/04/21 11:06:13 mha Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/cvs.sgml,v 1.51 2009/06/23 03:46:00 tgl Exp $ -->
22

33
<appendix id="cvs">
44
<appendixinfo>
@@ -171,6 +171,7 @@ cvs update
171171
pull requires reasonably up-to-date versions of <application>bison</>
172172
and <application>flex</>, which are not needed to build from a distribution
173173
tarball because the files made with them are pre-built in a tarball.
174+
You will need Perl as well.
174175
Otherwise the tool requirements are the same as building from source.
175176
</para>
176177
</sect1>

‎doc/src/sgml/installation.sgml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.324 2009/06/17 21:58:49 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.325 2009/06/23 03:46:00 tgl Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -294,13 +294,25 @@ su - postgres
294294
</indexterm>
295295

296296
GNU <application>Flex</> and <application>Bison</>
297-
are needed to build a CVS checkout or if you changed the actual
297+
are needed to buildfroma CVS checkout, or if you changed the actual
298298
scanner and parser definition files. If you need them, be sure
299299
to get <application>Flex</> 2.5.4 or later and
300300
<application>Bison</> 1.875 or later. Other <application>lex</>
301301
and <application>yacc</> programs cannot be used.
302302
</para>
303303
</listitem>
304+
<listitem>
305+
<para>
306+
<indexterm>
307+
<primary>perl</primary>
308+
</indexterm>
309+
310+
<application>Perl</> is also needed to build from a CVS checkout,
311+
or if you changed the input files for any of the build steps that
312+
use Perl scripts. If building on Windows you will need
313+
<application>Perl</> in any case.
314+
</para>
315+
</listitem>
304316
</itemizedlist>
305317
</para>
306318

‎src/Makefile.global.in

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.253 2009/02/19 10:32:30 petere Exp $
2+
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.254 2009/06/23 03:46:00 tgl Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -248,8 +248,12 @@ X = @EXEEXT@
248248

249249
# Perl
250250

251-
# quoted for pathname with spaces
252-
PERL= "@PERL@"
251+
ifneq (@PERL@,)
252+
# quoted to protect pathname with spaces
253+
PERL= "@PERL@"
254+
else
255+
PERL=$(missing) perl
256+
endif
253257
perl_archlibexp= @perl_archlibexp@
254258
perl_privlibexp= @perl_privlibexp@
255259
perl_useshrplib= @perl_useshrplib@

‎src/bin/psql/Makefile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.62 2009/03/07 00:13:58 alvherre Exp $
8+
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.63 2009/06/23 03:46:00 tgl Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -40,13 +40,8 @@ dumputils.c keywords.c: % : $(top_srcdir)/src/bin/pg_dump/%
4040
kwlookup.c:% :$(top_srcdir)/src/backend/parser/%
4141
rm -f$@&&$(LN_S)$<.
4242

43-
ifdefPERL
4443
$(srcdir)/sql_help.h: create_help.pl$(wildcard$(REFDOCDIR)/*.sgml)
4544
$(PERL)$<$(REFDOCDIR)$@
46-
else
47-
$(srcdir)/sql_help.h:
48-
@echo"*** Perl is needed to build psql help."
49-
endif
5045

5146
$(srcdir)/psqlscan.c: psqlscan.l
5247
ifdefFLEX

0 commit comments

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