diff options
author | Nicholas Clark <nick@ccl4.org> | 2008-09-03 22:16:31 +0000 |
---|---|---|
committer | Nicholas Clark <nick@ccl4.org> | 2008-09-03 22:16:31 +0000 |
commit | e3d7838ab1b0c4844e929a2db44e737b08d73bb0 (patch) | |
tree | 4f857b25a51077e6978d05d14b3284f5f06601c6 /hints | |
parent | 6b783f5082b793483f3fc9f62e30eeda44a3bc90 (diff) | |
download | perl-e3d7838ab1b0c4844e929a2db44e737b08d73bb0.tar.gz |
Integrate:
[ 34073]
AIX might miss libm
Subject: Re: Closing tickets in RT
From: "H.Merijn Brand" <h.m.brand@xs4all.nl>
Date: Tue, 29 Apr 2008 17:49:35 +0200
Message-ID: <20080429174935.0cb5763b@pc09.procura.nl>
[ 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 <doughera@lafayette.edu>
Date: Tue, 29 Jul 2008 12:00:52 -0400 (EDT)
Message-ID: <Pine.LNX.4.64.0807291159410.23060@fractal.phys.lafayette.edu>
[ 34168]
Add d_timegm to uconfig.sh to fix the generated uconfig.h.
p4raw-link: @34168 on //depot/perl: b78dccfb97f2a41b9be93ea6888a12b7bef9a4b2
p4raw-link: @34162 on //depot/perl: 395ff119ce07b37b4047046f91a4e4d2444f162b
p4raw-link: @34075 on //depot/perl: 79a3ac157a0fcf79cdd9388c59025a2ad55d224a
p4raw-link: @34073 on //depot/perl: d909c5cbac67256df64d980d1bef90e973c0d139
p4raw-id: //depot/maint-5.10/perl@34259
p4raw-integrated: from //depot/perl@34257 'copy in' hints/linux.sh
(@33845..) uconfig.sh (@33949..) hints/aix.sh (@33988..)
p4raw-integrated: from //depot/perl@34075 'copy in' win32/config_sh.PL
(@33347..)
Diffstat (limited to 'hints')
-rw-r--r-- | hints/aix.sh | 6 | ||||
-rw-r--r-- | hints/linux.sh | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/hints/aix.sh b/hints/aix.sh index 3cf6436f00..cc253f804c 100644 --- a/hints/aix.sh +++ b/hints/aix.sh @@ -80,6 +80,12 @@ EOF ;; 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" ;; diff --git a/hints/linux.sh b/hints/linux.sh index 220e6a002e..b254310539 100644 --- a/hints/linux.sh +++ b/hints/linux.sh @@ -97,7 +97,7 @@ case "`${cc:-cc} -V 2>&1`" in 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 |