In perl.git, the branch maint-5.16 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/68134919a7d178ed5250faeb59b377bbd16eb807?hp=f513e457e7877f09c03e208c28883292081e879c>
- Log ----------------------------------------------------------------- commit 68134919a7d178ed5250faeb59b377bbd16eb807 Author: Craig A. Berry <[email protected]> Date: Sat Sep 1 17:56:41 2012 -0500 Add Karen Etheridge to AUTHORS. M AUTHORS commit dabac76a373711325d3dd86cc844b7a46b2122a9 Author: Karen Etheridge <[email protected]> Date: Sat Sep 1 10:26:37 2012 -0700 RT#114312: prevent ls from colourizing output ANSI colour codes in the `ls -l /dev` output was preventing some substitutions from matching, causing a subsequent test to fail when 'stdout' or 'stderr' was not properly removed from $DEV. M t/op/stat.t commit 49a8948aee6d0bf06889396ea9d8496c9c264b88 Author: Tony Cook <[email protected]> Date: Wed Jul 11 22:12:25 2012 +1000 AIX isn't a new platform, move its note to the right place M pod/perldelta.pod commit 45258f3d47caba1b53847757a3184aec507979c1 Author: Darin McBride <[email protected]> Date: Fri Jun 29 22:46:43 2012 -0700 perldelta for 9d7bf4 M pod/perldelta.pod commit c75974d2823fafb62f9070fe549fc3f03671039f Author: Darin McBride <[email protected]> Date: Mon Jun 25 17:36:32 2012 -0600 AIX Hints file change Ok, I think my earlier problem came from not cleaning up properly between multiple compiles. So I don't need to modify any test. Proposed log entry: When compiling many of the perl modules available from CPAN, an expectation of C99 support seems implied by many authors. Unfortunately, xlC doesn't do this by default, we have to add -qlanglvl=extc99 to the ccflags to get this to work. And by the time we get to installing modules, this flag is already set in Config. So, add the flag unconditionally at the outset. Also, remove -qlonglong and -qlanglvl=extended from the flags to silence the warning that extc99 includes them and that xlC is going to ignore it, using extc99 instead. Signed-off-by: H.Merijn Brand <[email protected]> M hints/aix.sh ----------------------------------------------------------------------- Summary of changes: AUTHORS | 1 + hints/aix.sh | 13 ++++--------- pod/perldelta.pod | 9 +++++++-- t/op/stat.t | 1 + 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/AUTHORS b/AUTHORS index 7137bda..445ed7d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -605,6 +605,7 @@ Jörg Walter <[email protected]> José Pedro Oliveira <[email protected]> Ka-Ping Yee <[email protected]> Kaoru Maeda <[email protected]> +Karen Etheridge <[email protected]> Karl Glazebrook <[email protected]> Karl Heuer <[email protected]> Karl Simon Berg <[email protected]> diff --git a/hints/aix.sh b/hints/aix.sh index 63f245f..e1ae2fd 100644 --- a/hints/aix.sh +++ b/hints/aix.sh @@ -96,7 +96,7 @@ cc=${cc:-cc} ccflags="$ccflags -D_ALL_SOURCE -D_ANSI_C_SOURCE -D_POSIX_SOURCE" case "$cc" in *gcc*) ;; - *) ccflags="$ccflags -qmaxmem=-1 -qnoansialias" ;; + *) ccflags="$ccflags -qmaxmem=-1 -qnoansialias -qlanglvl=extc99" ;; esac nm_opt='-B' @@ -245,13 +245,9 @@ case "$usethreads" in cc_r) ;; xlc_r) - # for -qlonglong - ccflags="$ccflags -qlanglvl=extended" ;; # we do not need the C++ compiler xlC_r) - # for -qlonglong - ccflags="$ccflags -qlanglvl=extended" cc=xlc_r ;; '') @@ -272,13 +268,9 @@ case "$usethreads" in *) case "$cc" in xlc) - # for -qlonglong - ccflags="$ccflags -qlanglvl=extended" ;; # we do not need the C++ compiler xlC) - # for -qlonglong - ccflags="$ccflags -qlanglvl=extended" cc=xlc ;; *) @@ -348,6 +340,9 @@ libswanted_uselargefiles="`getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e 's@ $define|true|[yY]*) cc="$cc -q64" ;; *) cc="$cc -q32" ;; esac + # Some 32-bit getconfs will set ccflags to include -qlonglong + # but that's no longer needed with an explicit -qextc99. + ccflags="`echo $ccflags | sed -e 's@ -qlonglong@@`" ;; *) # Remove xlc-specific -qflags. ccflags="`echo $ccflags | sed -e 's@ -q[^ ]*@ @g' -e 's@^-q[^ ]* @@g'`" diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 47efdca..b299e45 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -263,9 +263,8 @@ source tree. =over 4 -=item XXX-some-platform +=item XXX -XXX =back @@ -294,6 +293,12 @@ L</Modules and Pragmata> section. XXX +=item AIX + +Configure now always adds -qlanglvl=extc99 to the CC flags on AIX when +using xlC. This will make it easier to compile a number of XS-based modules +that assume C99 [perl #113778]. + =back =head1 Internal Changes diff --git a/t/op/stat.t b/t/op/stat.t index af1fa5e..ac42d43 100644 --- a/t/op/stat.t +++ b/t/op/stat.t @@ -249,6 +249,7 @@ SKIP: { skip "ls command not available to Perl in OpenVMS right now.", 6 if $Is_VMS; + delete $ENV{CLICOLOR_FORCE}; my $LS = $Config{d_readlink} ? "ls -lL" : "ls -l"; my $CMD = "$LS /dev 2>/dev/null"; my $DEV = qx($CMD); -- Perl5 Master Repository
