import perl 5.10.1

1 files changed, 12 insertions, 3 deletions

diff --git a/gnu/usr.bin/perl/hints/aix_4.sh b/gnu/usr.bin/perl/hints/aix_4.sh
index 46e8d25ffd0..46b95b90833 100644
--- a/gnu/usr.bin/perl/hints/aix_4.sh
+++ b/gnu/usr.bin/perl/hints/aix_4.sh
@@ -113,6 +113,15 @@ case "$cc" in
     *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.
@@ -383,10 +392,10 @@ ldflags_uselargefiles="`getconf XBS5_ILP32_OFFBIG_LDFLAGS 2>/dev/null`"
 	ldflags_uselargefiles="`echo $ldflags_uselargefiles`"
 	if test X"$use64bitint:$quadtype" = X"$define:long" -o X"$use64bitall" = Xdefine; then
 # Keep this at the left margin.
-libswanted_uselargefiles="`getconf XBS5_LP64_OFF64_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
+libswanted_uselargefiles="`getconf XBS5_LP64_OFF64_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g'`"
 	else
 # Keep this at the left margin.
-libswanted_uselargefiles="`getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
+libswanted_uselargefiles="`getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g'`"
 	    fi
 
 	case "$ccflags_uselargefiles$ldflags_uselargefiles$libs_uselargefiles" in
@@ -494,7 +503,7 @@ EOM
 	# string is simply not detectable by any means.  Since it doesn't
 	# do any harm, I didn't pursue it. -- sh
 	qaldflags="`echo $qaldflags`"
-	qalibs="`getconf XBS5_LP64_OFF64_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
+	qalibs="`getconf XBS5_LP64_OFF64_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g'`"
 	# -q32 and -b32 may have been set by uselargefiles or user.
 	# Remove them.
 	ccflags="`echo $ccflags | sed -e 's@-q32@@'`"