In metaconfig.git, the branch master has been updated <http://perl5.git.perl.org/metaconfig.git/commitdiff/6452fb66ea0797359d91b6be01195e3f785ddf94?hp=417455c42f4a42e2876f605b577c5cc8f4f86187>
- Log ----------------------------------------------------------------- commit 6452fb66ea0797359d91b6be01195e3f785ddf94 Author: H.Merijn Brand - Tux <[email protected]> Date: Sat Sep 6 21:51:36 2014 +0200 We do *not* want to use mconfig from mono-web :( M U/ln-all.pl commit c3698b7b6adfc6af725c5cb0aea00cd0f7f1fd9c Author: H.Merijn Brand - Tux <[email protected]> Date: Sat Sep 6 21:50:58 2014 +0200 remove trailing whitespace M U/a_dvisory/multiarch.U M U/a_dvisory/quadtype.U M U/compline/Compile.U M U/installdirs/perl5.U M U/modified/Myinit.U M U/modified/d_backtrace.U M U/modified/d_dladdr.U M U/modified/i_execinfo.U M U/perl/Checkcc.U M U/perl/IncClean.U M U/perl/ansi2knr.U M U/perl/bincompat3.U M U/perl/d_portable.U M U/perl/oldarchlib.U M U/protos/netdbtype.U ----------------------------------------------------------------------- Summary of changes: U/a_dvisory/multiarch.U | 2 +- U/a_dvisory/quadtype.U | 2 +- U/compline/Compile.U | 6 +++--- U/installdirs/perl5.U | 2 +- U/ln-all.pl | 2 +- U/modified/Myinit.U | 4 ++-- U/modified/d_backtrace.U | 2 +- U/modified/d_dladdr.U | 2 +- U/modified/i_execinfo.U | 2 +- U/perl/Checkcc.U | 18 +++++++++--------- U/perl/IncClean.U | 6 +++--- U/perl/ansi2knr.U | 8 ++++---- U/perl/bincompat3.U | 2 +- U/perl/d_portable.U | 4 ++-- U/perl/oldarchlib.U | 18 +++++++++--------- U/protos/netdbtype.U | 20 ++++++++++---------- 16 files changed, 50 insertions(+), 50 deletions(-) diff --git a/U/a_dvisory/multiarch.U b/U/a_dvisory/multiarch.U index 811af88..68c8d25 100644 --- a/U/a_dvisory/multiarch.U +++ b/U/a_dvisory/multiarch.U @@ -5,7 +5,7 @@ ?RCS: This file is included with or a derivative work of a file included ?RCS: with the metaconfig program of Raphael Manfredi's "dist" distribution. ?RCS: In accordance with clause 7 of dist's modified Artistic License: -?RCS: +?RCS: ?RCS: You may distribute under the terms of either the GNU General Public ?RCS: License or the Artistic License, as specified in the README file. ?RCS: diff --git a/U/a_dvisory/quadtype.U b/U/a_dvisory/quadtype.U index 94812d8..02b15ad 100644 --- a/U/a_dvisory/quadtype.U +++ b/U/a_dvisory/quadtype.U @@ -14,7 +14,7 @@ ?S: quadtype. ?S:. ?S:quadtype: -?S: This variable defines Quad_t to be something like long, int, +?S: This variable defines Quad_t to be something like long, int, ?S: long long, int64_t, or whatever type is used for 64-bit integers. ?S:. ?S:quadkind: diff --git a/U/compline/Compile.U b/U/compline/Compile.U index 4ba5ada..3de1bb8 100644 --- a/U/compline/Compile.U +++ b/U/compline/Compile.U @@ -29,9 +29,9 @@ ?S: echo 'int main() { exit(0); }' > try.c ?S: set try ?S: if eval $compile; then -?S: echo "success" # and do whatever . . . +?S: echo "success" # and do whatever . . . ?S: else -?S: echo "failure" # and do whatever . . . +?S: echo "failure" # and do whatever . . . ?S: fi ?S: To add extra flags cc flags (e.g. -DWHATEVER) just put them ?S: in $*, e.g. @@ -41,7 +41,7 @@ ?S: This shell variable is used internally by Configure to provide ?S: a convenient shorthand for the typical compile command that you ?S: expect to work ok. It is the same as $compile, except we -?S: deliberately let the user see any error messages. +?S: deliberately let the user see any error messages. ?S:. : define a shorthand compile call compile=' diff --git a/U/installdirs/perl5.U b/U/installdirs/perl5.U index b1f0024..d321c56 100644 --- a/U/installdirs/perl5.U +++ b/U/installdirs/perl5.U @@ -1,7 +1,7 @@ ?RCS: $Id: perl5.U,v $ ?RCS: ?RCS: Copyright (c) 2000 Andrew Dougherty -?RCS: +?RCS: ?RCS: You may distribute under the terms of either the GNU General Public ?RCS: License or the Artistic License, as specified in the README file. ?RCS: diff --git a/U/ln-all.pl b/U/ln-all.pl index b96bdaf..fc774db 100755 --- a/U/ln-all.pl +++ b/U/ln-all.pl @@ -26,7 +26,7 @@ for (@safe) { copy "$perl/$_", $_; } -@ARGV = ("mconfig -v -m -O 2>&1 |"); +@ARGV = ("/pro/3gl/CPAN/bin/mconfig -v -m -O 2>&1 |"); while (<>) { s{^\s+$perl/U}{} or next; chomp; diff --git a/U/modified/Myinit.U b/U/modified/Myinit.U index e4f7220..e9b00a6 100644 --- a/U/modified/Myinit.U +++ b/U/modified/Myinit.U @@ -1,11 +1,11 @@ ?RCS: $Id: Myinit.U,v 3.0 1993/08/18 12:05:07 ram Exp $ ?RCS: ?RCS: Copyright (c) 1991-1993, Raphael Manfredi -?RCS: +?RCS: ?RCS: This file is included with or a derivative work of a file included ?RCS: with the metaconfig program of Raphael Manfredi's "dist" distribution. ?RCS: In accordance with clause 7 of dist's modified Artistic License: -?RCS: +?RCS: ?RCS: You may distribute under the terms of either the GNU General Public ?RCS: License or the Artistic License, as specified in the README file. ?RCS: diff --git a/U/modified/d_backtrace.U b/U/modified/d_backtrace.U index efda7ed..6dfb7ba 100644 --- a/U/modified/d_backtrace.U +++ b/U/modified/d_backtrace.U @@ -1,7 +1,7 @@ ?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 2014, H.Merijn Brand -?RCS: +?RCS: ?RCS: You may redistribute only under the terms of the Artistic License, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of diff --git a/U/modified/d_dladdr.U b/U/modified/d_dladdr.U index 6630679..a6417e8 100644 --- a/U/modified/d_dladdr.U +++ b/U/modified/d_dladdr.U @@ -1,7 +1,7 @@ ?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 2014, H.Merijn Brand -?RCS: +?RCS: ?RCS: You may redistribute only under the terms of the Artistic License, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of diff --git a/U/modified/i_execinfo.U b/U/modified/i_execinfo.U index f9b16a7..e6322bc 100644 --- a/U/modified/i_execinfo.U +++ b/U/modified/i_execinfo.U @@ -1,7 +1,7 @@ ?RCS: $Id: i_execinfo.U 34 2010-11-27 11:55:39Z rmanfredi $ ?RCS: ?RCS: Copyright (c) 2011, Raphael Manfredi -?RCS: +?RCS: ?RCS: You may redistribute only under the terms of the Artistic License, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of diff --git a/U/perl/Checkcc.U b/U/perl/Checkcc.U index 9bffda7..1a7e8a2 100644 --- a/U/perl/Checkcc.U +++ b/U/perl/Checkcc.U @@ -2,11 +2,11 @@ ?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 2000, Jarkko Hietaniemi -?RCS: -?X: +?RCS: +?X: ?X: This unit produces a bit of shell code that must be dotted in order ?X: to make quick check on whether the current C compiler is working. -?X: +?X: ?MAKE:Checkcc ccname ccversion: rm cat test Myread startsh ?MAKE: -pick add $@ %< ?S:ccname: @@ -67,11 +67,11 @@ EOM # The most common problem is -D_REENTRANT for threads. # This heuristic catches that case, but gets false positives # if -Dusethreads was not actually specified. Better to - # bail out here with a useful message than fail + # bail out here with a useful message than fail # mysteriously later. Should we perhaps just try to # re-invoke Configure -Dcc=gcc config_args ? if $test -f usethreads.cbu; then - $cat >&4 <<EOM + $cat >&4 <<EOM *** However, any setting of the C compiler flags (e.g. for thread support) *** will be lost. It may be necessary for you to restart Configure and @@ -93,7 +93,7 @@ EOM echo "Cannot find myread, sorry. Aborting." >&2 exit 1 fi - fi + fi case "$ans" in [yY]*) cc=gcc; ccname=gcc; ccflags=''; despair=no; esac @@ -109,9 +109,9 @@ cat <<EOS >checkcc $startsh EOS cat <<'EOSC' >>checkcc -case "$cc" in +case "$cc" in '') ;; -*) $rm -f try try.* +*) $rm -f try try.* $cat >try.c <<EOM int main(int argc, char *argv[]) { return 0; @@ -123,7 +123,7 @@ EOM if $test X"$despair" = Xyes; then echo "Uh-oh, the C compiler '$cc' doesn't seem to be working." >&4 fi - $cat >&4 <<EOM + $cat >&4 <<EOM You need to find a working C compiler. Either (purchase and) install the C compiler supplied by your OS vendor, or for a free C compiler try http://gcc.gnu.org/ diff --git a/U/perl/IncClean.U b/U/perl/IncClean.U index bcd414e..1f3a564 100644 --- a/U/perl/IncClean.U +++ b/U/perl/IncClean.U @@ -2,11 +2,11 @@ ?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 2000, Jarkko Hietaniemi -?RCS: -?X: +?RCS: +?X: ?X: This unit produces a bit of shell code that must be dotted in order ?X: to make quick check on whether the current C compiler is working. -?X: +?X: ?MAKE:IncClean: ccflags cppflags ?MAKE: -pick add $@ %< ?LINT:extern ccflags diff --git a/U/perl/ansi2knr.U b/U/perl/ansi2knr.U index e8476f0..b7359c3 100644 --- a/U/perl/ansi2knr.U +++ b/U/perl/ansi2knr.U @@ -8,7 +8,7 @@ ?MAKE:ansi2knr: prototype +cc +ccflags package ?MAKE: -pick add $@ %< ?S:ansi2knr: -?S: This variable is set if the user needs to run ansi2knr. +?S: This variable is set if the user needs to run ansi2knr. ?S: Currently, this is not supported, so we just abort. ?S:. ?Y:TOP @@ -20,12 +20,12 @@ case "$prototype" in cat <<EOM >&4 $me: FATAL ERROR: -This version of $package can only be compiled by a compiler that -understands function prototypes. Unfortunately, your C compiler +This version of $package can only be compiled by a compiler that +understands function prototypes. Unfortunately, your C compiler $cc $ccflags doesn't seem to understand them. Sorry about that. -If GNU cc is available for your system, perhaps you could try that instead. +If GNU cc is available for your system, perhaps you could try that instead. Eventually, we hope to support building Perl with pre-ANSI compilers. If you would like to help in that effort, please contact <[email protected]>. diff --git a/U/perl/bincompat3.U b/U/perl/bincompat3.U index 3f6c52a..baa32ec 100644 --- a/U/perl/bincompat3.U +++ b/U/perl/bincompat3.U @@ -19,7 +19,7 @@ ?S:. ?C:BINCOMPAT3: ?C: This symbol, if defined, indicates that Perl 5.004 should be -?C: binary-compatible with Perl 5.003. This is impossible for +?C: binary-compatible with Perl 5.003. This is impossible for ?C: 5.004_50 and later, so it is always undefined for those versions. ?C:. ?H:#$d_bincompat3 BINCOMPAT3 /**/ diff --git a/U/perl/d_portable.U b/U/perl/d_portable.U index 5256d44..71075cb 100644 --- a/U/perl/d_portable.U +++ b/U/perl/d_portable.U @@ -1,11 +1,11 @@ ?RCS: $Id: d_portable.U,v 3.0.1.2 1995/01/11 15:28:52 ram Exp $ ?RCS: ?RCS: Copyright (c) 1991-1993, Raphael Manfredi -?RCS: +?RCS: ?RCS: This file is included with or a derivative work of a file included ?RCS: with the metaconfig program of Raphael Manfredi's "dist" distribution. ?RCS: In accordance with clause 7 of dist's modified Artistic License: -?RCS: +?RCS: ?RCS: You may distribute under the terms of either the GNU General Public ?RCS: License or the Artistic License, as specified in the README file. ?RCS: diff --git a/U/perl/oldarchlib.U b/U/perl/oldarchlib.U index 91da11a..e8c80bb 100644 --- a/U/perl/oldarchlib.U +++ b/U/perl/oldarchlib.U @@ -16,11 +16,11 @@ ?S:. ?S:oldarchlib: ?S: This variable holds the name of the directory in which perl5.000 -?S: and perl5.001 stored +?S: and perl5.001 stored ?S: architecture-dependent public library files. ?S:. ?S:oldarchlibexp: -?S: This variable is the same as the oldarchlib variable, but is +?S: This variable is the same as the oldarchlib variable, but is ?S: filename expanded at configuration time, for convenient use. ?S:. ?C:OLDARCHLIB: @@ -32,7 +32,7 @@ ?C:. ?C:OLDARCHLIB_EXP: ?C: This symbol contains the ~name expanded version of OLDARCHLIB, to be -?C: used in programs that are not prepared to deal with ~ expansion at +?C: used in programs that are not prepared to deal with ~ expansion at ?C: run-time. ?C:. ?H:#$d_oldarchlib OLDARCHLIB "$oldarchlib" /**/ @@ -47,7 +47,7 @@ case "$oldarchlib" in ;; esac ;; -*) dflt="$oldarchlib" +*) dflt="$oldarchlib" ;; esac if $test ! -d "$dflt/auto"; then @@ -56,12 +56,12 @@ fi cat <<EOM In 5.001, Perl stored architecture-dependent library files in a directory -with a name such as $privlib/$archname, -and this directory contained files from the standard extensions and -files from any additional extensions you might have added. Starting -with version 5.002, all the architecture-dependent standard extensions +with a name such as $privlib/$archname, +and this directory contained files from the standard extensions and +files from any additional extensions you might have added. Starting +with version 5.002, all the architecture-dependent standard extensions will go into a version-specific directory such as -$archlib, +$archlib, while locally-added extensions will go into $sitearch. diff --git a/U/protos/netdbtype.U b/U/protos/netdbtype.U index 5257b92..166f295 100644 --- a/U/protos/netdbtype.U +++ b/U/protos/netdbtype.U @@ -58,7 +58,7 @@ ?H:. ?T:xxx yyy try hdrs @if netdb_host_type || Netdb_host_t || netdb_hlen_type || Netdb_hlen_t -: check for type of arguments to gethostbyaddr. +: check for type of arguments to gethostbyaddr. if test "X$netdb_host_type" = X -o "X$netdb_hlen_type" = X; then case "$d_gethbyaddr" in $define) @@ -67,8 +67,8 @@ if test "X$netdb_host_type" = X -o "X$netdb_hlen_type" = X; then Checking to see what type of arguments are accepted by gethostbyaddr(). EOM hdrs="$define sys/types.h - $d_socket sys/socket.h - $i_niin netinet/in.h + $d_socket sys/socket.h + $i_niin netinet/in.h $i_netdb netdb.h $i_unistd unistd.h" : The first arg can 'char *' or 'void *' @@ -105,14 +105,14 @@ EOM netdb_hlen_type="$sizetype" ;; esac - # Remove the "const" if needed. -- but then we'll have a + # Remove the "const" if needed. -- but then we'll have a # prototype clash! # netdb_host_type=`echo "$netdb_host_type" | sed 's/^const //'` fi @end @if netdb_name_type || Netdb_name_t -: check for type of argument to gethostbyname. +: check for type of argument to gethostbyname. if test "X$netdb_name_type" = X ; then case "$d_gethbyname" in $define) @@ -121,8 +121,8 @@ if test "X$netdb_name_type" = X ; then Checking to see what type of argument is accepted by gethostbyname(). EOM hdrs="$define sys/types.h - $d_socket sys/socket.h - $i_niin netinet/in.h + $d_socket sys/socket.h + $i_niin netinet/in.h $i_netdb netdb.h $i_unistd unistd.h" for xxx in "const char *" "char *"; do @@ -152,7 +152,7 @@ fi @end @if netdb_net_type || Netdb_net_t -: check for type of 1st argument to getnetbyaddr. +: check for type of 1st argument to getnetbyaddr. if test "X$netdb_net_type" = X ; then case "$d_getnbyaddr" in $define) @@ -161,8 +161,8 @@ if test "X$netdb_net_type" = X ; then Checking to see what type of 1st argument is accepted by getnetbyaddr(). EOM hdrs="$define sys/types.h - $d_socket sys/socket.h - $i_niin netinet/in.h + $d_socket sys/socket.h + $i_niin netinet/in.h $i_netdb netdb.h $i_unistd unistd.h" for xxx in in_addr_t "unsigned long" long "unsigned int" int; do -- perl5 metaconfig repository
