Change 34259 by [EMAIL PROTECTED] on 2008/09/03 22:16:31
Integrate:
[ 34073]
AIX might miss libm
Subject: Re: Closing tickets in RT
From: "H.Merijn Brand" <[EMAIL PROTECTED]>
Date: Tue, 29 Apr 2008 17:49:35 +0200
Message-ID: <[EMAIL PROTECTED]>
[ 34075]
Make the version string more consistent between Windows and other
platforms.
Noticed and reported by Dave Golden.
[ 34162]
Subject: [PATCH] Minor hints/linux.sh patch to allow setting -Doptimize
From: Andrew Dougherty <[EMAIL PROTECTED]>
Date: Tue, 29 Jul 2008 12:00:52 -0400 (EDT)
Message-ID: <[EMAIL PROTECTED]>
[ 34168]
Add d_timegm to uconfig.sh to fix the generated uconfig.h.
Affected files ...
... //depot/maint-5.10/perl/hints/aix.sh#3 integrate
... //depot/maint-5.10/perl/hints/linux.sh#3 integrate
... //depot/maint-5.10/perl/uconfig.sh#8 integrate
... //depot/maint-5.10/perl/win32/config_sh.PL#3 integrate
Differences ...
==== //depot/maint-5.10/perl/hints/aix.sh#3 (text) ====
Index: perl/hints/aix.sh
--- perl/hints/aix.sh#2~34032~ 2008-06-08 13:30:05.000000000 -0700
+++ perl/hints/aix.sh 2008-09-03 15:16:31.000000000 -0700
@@ -80,6 +80,12 @@
;;
esac
+ s=`lslpp -lc bos.adt.libm >/dev/null`
+if [ $? != 0 ]; then
+ echo "You cannot build perl without the bos.adt.libm package installed" >&4
+ exit
+ fi
+
# uname -m output is too specific and not appropriate here
case "$archname" in
'') archname="$osname" ;;
==== //depot/maint-5.10/perl/hints/linux.sh#3 (text) ====
Index: perl/hints/linux.sh
--- perl/hints/linux.sh#2~33904~ 2008-05-21 09:37:54.000000000 -0700
+++ perl/hints/linux.sh 2008-09-03 15:16:31.000000000 -0700
@@ -97,7 +97,7 @@
esac
;;
*"Sun C"*)
- optimize='-xO2'
+ test "$optimize" || optimize='-xO2'
cccdlflags='-KPIC'
lddlflags='-G -Bdynamic'
# Sun C doesn't support gcc attributes, but, in many cases, doesn't
==== //depot/maint-5.10/perl/uconfig.sh#8 (xtext) ====
Index: perl/uconfig.sh
--- perl/uconfig.sh#7~33955~ 2008-05-30 18:54:46.000000000 -0700
+++ perl/uconfig.sh 2008-09-03 15:16:31.000000000 -0700
@@ -423,6 +423,7 @@
d_telldir='undef'
d_telldirproto='undef'
d_time='define'
+d_timegm='undef'
d_times='undef'
d_tm_tm_gmtoff='undef'
d_tm_tm_zone='undef'
==== //depot/maint-5.10/perl/win32/config_sh.PL#3 (text) ====
Index: perl/win32/config_sh.PL
--- perl/win32/config_sh.PL#2~33892~ 2008-05-20 16:03:07.000000000 -0700
+++ perl/win32/config_sh.PL 2008-09-03 15:16:31.000000000 -0700
@@ -78,7 +78,7 @@
$opt{VERSION} = "$opt{PERL_REVISION}.$opt{PERL_VERSION}.$opt{PERL_SUBVERSION}";
$opt{INST_VER} =~ s|~VERSION~|$opt{VERSION}|g;
$opt{'version_patchlevel_string'} = "version $opt{PERL_VERSION} subversion
$opt{PERL_SUBVERSION}";
-$opt{'version_patchlevel_string'} .= " patchlevel $opt{PERL_PATCHLEVEL}" if
exists $opt{PERL_PATCHLEVEL};
+$opt{'version_patchlevel_string'} .= " patch $opt{PERL_PATCHLEVEL}" if exists
$opt{PERL_PATCHLEVEL};
my $ver = `ver 2>nul`;
if ($ver =~ /Version (\d+\.\d+)/) {
End of Patch.
