Change 20534 by [EMAIL PROTECTED] on 2003/08/06 18:46:41
Integrate:
[ 20529]
Various tweaks to help DJGPP builds.
[ 20530]
Make code agree with documentation (from Wolfgang Friebel)
[ 20533]
Subject: [pathc] Sys:Syslog.pm::syslog() - Better error message
From: [EMAIL PROTECTED] (Jari Aalto)
Date: Wed, 06 Aug 2003 14:24:42 +0300
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/djgpp/djgppsed.sh#2 integrate
... //depot/maint-5.8/perl/ext/Sys/Syslog/Syslog.pm#4 integrate
... //depot/maint-5.8/perl/hints/dos_djgpp.sh#2 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MakeMaker.pm#14 integrate
Differences ...
==== //depot/maint-5.8/perl/djgpp/djgppsed.sh#2 (text) ====
Index: perl/djgpp/djgppsed.sh
--- perl/djgpp/djgppsed.sh#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/djgpp/djgppsed.sh Wed Aug 6 11:46:41 2003
@@ -36,7 +36,7 @@
sed -e $SCPP t/comp/cpp.aux |tr -d '\r' >s; mv -f s t/comp/cpp.aux
sed -e $SARGV -e $SDOTTMP t/io/argv.t >s; mv -f s t/io/argv.t
sed -e $SABC t/io/inplace.t >s; mv -f s t/io/inplace.t
-sed -e $SDBMX -e $SDBHASH ext/GDBM_File/gdbm.t >s; mv -f s ext/GDBM_File/gdbm.t
+sed -e $SDBMX -e $SDBHASH ext/GDBM_File/t/gdbm.t >s; mv -f s ext/GDBM_File/t/gdbm.t
sed -e $SSTAT -e $STMP2 t/op/stat.t >s; mv -f s t/op/stat.t
sed -e $SLIST x2p/Makefile.SH |tr -d '\r' >s; mv -f s x2p/Makefile.SH
sed -e 's=^#define.\([A-Z]\+\)_EXP.*$=#define \1_EXP djgpp_pathexp("\1")=g'
config_h.SH >s; mv -f s config_h.SH
==== //depot/maint-5.8/perl/ext/Sys/Syslog/Syslog.pm#4 (text) ====
Index: perl/ext/Sys/Syslog/Syslog.pm
--- perl/ext/Sys/Syslog/Syslog.pm#3~19161~ Sun Apr 6 21:20:20 2003
+++ perl/ext/Sys/Syslog/Syslog.pm Wed Aug 6 11:46:41 2003
@@ -251,7 +251,8 @@
local(@words, $num, $numpri, $numfac, $sum);
local($facility) = $facility; # may need to change temporarily.
- croak "syslog: expected both priority and mask" unless $mask && $priority;
+ croak "syslog: expecting argument \$priority" unless $priority;
+ croak "syslog: expecting argument \$format" unless $mask;
@words = split(/\W+/, $priority, 2);# Allow "level" or "level|facility".
undef $numpri;
==== //depot/maint-5.8/perl/hints/dos_djgpp.sh#2 (text) ====
Index: perl/hints/dos_djgpp.sh
--- perl/hints/dos_djgpp.sh#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/hints/dos_djgpp.sh Wed Aug 6 11:46:41 2003
@@ -40,7 +40,12 @@
case "X$optimize" in
X)
- optimize="-O2 -malign-loops=2 -malign-jumps=2 -malign-functions=2"
+ case "`gcc -v 2>&1|grep "gcc version"` in
+ "gcc version 3.*")
+ optimize="-O2 -falign-loops=2 -falign-jumps=2 -falign-functions=2" ;;
+ *)
+ optimize="-O2 -malign-loops=2 -malign-jumps=2 -malign-functions=2" ;;
+ esac
ldflags='-s'
;;
X*)
==== //depot/maint-5.8/perl/lib/ExtUtils/MakeMaker.pm#14 (text) ====
Index: perl/lib/ExtUtils/MakeMaker.pm
--- perl/lib/ExtUtils/MakeMaker.pm#13~20468~ Sun Aug 3 22:16:18 2003
+++ perl/lib/ExtUtils/MakeMaker.pm Wed Aug 6 11:46:41 2003
@@ -354,6 +354,7 @@
if ("@ARGV" =~ /\bPREREQ_PRINT\b/) {
require Data::Dumper;
print Data::Dumper->Dump([$self->{PREREQ_PM}], [qw(PREREQ_PM)]);
+ exit 0;
}
# PRINT_PREREQ is RedHatism.
End of Patch.
