Change 33479 by [EMAIL PROTECTED] on 2008/03/11 18:08:11
Integrate:
[ 33288]
Integrate:
[ 33040]
Subject: [PATCH] Re: Perl @ 32984 (also relevant to [perl #33849])
From: Andrew Dougherty <[EMAIL PROTECTED]>
Date: Tue, 22 Jan 2008 11:59:47 -0500 (EST)
Message-ID: <[EMAIL PROTECTED]>
[ 33246]
Subject: Re: [PATCH] Re: Perl @ 32984 (also relevant to [perl #33849])
From: Andy Dougherty <[EMAIL PROTECTED]>
Date: Fri, 1 Feb 2008 12:39:39 -0500 (EST)
Message-ID: <[EMAIL PROTECTED]>
[ 33262]
Subject: [PATCH] hints/aix_4.sh to allow build on aix 4.2
From: AUGUSTE-ETIENNE Jose <[EMAIL PROTECTED]>
Date: Fri, 08 Feb 2008 17:10:26 -0300
Message-Id: <[EMAIL PROTECTED]>
[ 33275]
Correct quad-related %Config variables on VMS.
Affected files ...
... //depot/maint-5.8/perl/configure.com#62 integrate
... //depot/maint-5.8/perl/hints/aix_4.sh#6 integrate
... //depot/maint-5.8/perl/hints/irix_6.sh#8 integrate
Differences ...
==== //depot/maint-5.8/perl/configure.com#62 (text) ====
Index: perl/configure.com
--- perl/configure.com#61~33005~ 2008-01-18 11:14:53.000000000 -0800
+++ perl/configure.com 2008-03-11 11:08:11.000000000 -0700
@@ -3182,9 +3182,8 @@
$!
$ perllibs=libs
$!
-$! Are we 64 bit?
$!
-$ IF use64bitint .OR. use64bitint .EQS. "define"
+$ IF archname .NES. "VMS_VAX"
$ THEN
$ d_PRId64 = "define"
$ d_PRIu64 = "define"
@@ -3200,7 +3199,11 @@
$ d_quad = "define"
$ quadtype = "long long"
$ uquadtype = "unsigned long long"
-$ quadkind = "QUAD_IS_LONG_LONG"
+$ quadkind = "3"
+$!
+$ d_frexpl = "define"
+$ d_modfl = "define"
+$ d_modflproto = "define"
$ ELSE
$ d_PRId64 = "undef"
$ d_PRIXU64 = "undef"
@@ -3214,17 +3217,10 @@
$ sPRIu64 = ""
$ sPRIx64 = ""
$ d_quad = "undef"
-$ quadtype = "long"
-$ uquadtype = "unsigned long"
-$ quadkind = "QUAD_IS_LONG"
-$ ENDIF
+$ quadtype = "undef"
+$ uquadtype = "undef"
+$ quadkind = "undef"
$!
-$ IF archname .NES. "VMS_VAX"
-$ THEN
-$ d_frexpl = "define"
-$ d_modfl = "define"
-$ d_modflproto = "define"
-$ ELSE
$ d_frexpl = "undef"
$ d_modfl = "undef"
$ d_modflproto = "undef"
==== //depot/maint-5.8/perl/hints/aix_4.sh#6 (xtext) ====
Index: perl/hints/aix_4.sh
--- perl/hints/aix_4.sh#5~30046~ 2007-01-27 15:25:32.000000000 -0800
+++ perl/hints/aix_4.sh 2008-03-11 11:08:11.000000000 -0700
@@ -113,6 +113,15 @@
*gcc*) ;;
*) ccflags="$ccflags -qmaxmem=-1 -qnoansialias" ;;
esac
+
+# since change #28654, _XOPEN_SOURCE symbol needs to be defined on aix 4.2
+# to avoid the following build error in perlio.c :
+# 1506-294 (S) Syntax error in expression on #if directive.
+#
+case "$osvers" in
+ 4.2.1.0) ccflags="$ccflags -D_XOPEN_SOURCE" ;;
+ *) ;;
+ esac
nm_opt='-B'
# These functions don't work like Perl expects them to.
==== //depot/maint-5.8/perl/hints/irix_6.sh#8 (text) ====
Index: perl/hints/irix_6.sh
--- perl/hints/irix_6.sh#7~23460~ 2004-11-01 06:16:33.000000000 -0800
+++ perl/hints/irix_6.sh 2008-03-11 11:08:11.000000000 -0700
@@ -337,6 +337,20 @@
;;
esac
+
+# Workaround [perl #33849]: perl 5.8.6 fails to build on IRIX 6.5 due to
+# bizarre preprocessor bug: cc -E - unfortunately goes into K&R mode, but
+# cc -E file.c doesn't. Force a wrapper to always get the ANSI mode.
+# (We only need to do this for cc, not for gcc. ccversion is computed above.)
+case "$ccversion" in
+'') ;; # gcc. Do nothing.
+*) # Inside this call-back unit, we are down in the UU/ subdirectory,
+ # but Configure will look for cppstdin one level up.
+ cd ..; cppstdin=`pwd`/cppstdin; cd UU
+ cpprun="$cppstdin"
+ ;;
+esac
+
EOCCBU
# End of cc.cbu callback unit. - Allen
End of Patch.
