Change 34032 by [EMAIL PROTECTED] on 2008/06/08 20:30:05
Integrate:
[ 33988]
Embarrassing errors to find: missing quotes in sed commands
[ 33990]
#33988 for AIX 3 and AIX 4: missing quotes in sed commands
Affected files ...
... //depot/maint-5.10/perl/hints/aix.sh#2 integrate
... //depot/maint-5.10/perl/hints/aix_3.sh#2 integrate
... //depot/maint-5.10/perl/hints/aix_4.sh#3 integrate
Differences ...
==== //depot/maint-5.10/perl/hints/aix.sh#2 (text) ====
Index: perl/hints/aix.sh
--- perl/hints/aix.sh#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/hints/aix.sh 2008-06-08 13:30:05.000000000 -0700
@@ -295,10 +295,10 @@
fi
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
'[EMAIL PROTECTED]@@' -e 's@ -l@ @g`"
+libswanted_uselargefiles="`getconf XBS5_LP64_OFF64_LIBS 2>/dev/null|sed -e
'[EMAIL PROTECTED]@@' -e 's@ -l@ @g'`"
else
# Keep this at the left margin.
-libswanted_uselargefiles="`getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e
'[EMAIL PROTECTED]@@' -e 's@ -l@ @g`"
+libswanted_uselargefiles="`getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e
'[EMAIL PROTECTED]@@' -e 's@ -l@ @g'`"
fi
case "$ccflags_uselargefiles$ldflags_uselargefiles$libs_uselargefiles"
in
@@ -419,7 +419,7 @@
# 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 '[EMAIL
PROTECTED]@@' -e 's@ -l@ @g`"
+ qalibs="`getconf XBS5_LP64_OFF64_LIBS 2>/dev/null|sed -e '[EMAIL
PROTECTED]@@' -e 's@ -l@ @g'`"
# -q32 and -b32 may have been set by uselargefiles or user.
# Remove them.
ccflags="`echo $ccflags | sed -e '[EMAIL PROTECTED]@@'`"
==== //depot/maint-5.10/perl/hints/aix_3.sh#2 (text) ====
Index: perl/hints/aix_3.sh
--- perl/hints/aix_3.sh#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/hints/aix_3.sh 2008-06-08 13:30:05.000000000 -0700
@@ -294,10 +294,10 @@
fi
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
'[EMAIL PROTECTED]@@' -e 's@ -l@ @g`"
+libswanted_uselargefiles="`getconf XBS5_LP64_OFF64_LIBS 2>/dev/null|sed -e
'[EMAIL PROTECTED]@@' -e 's@ -l@ @g'`"
else
# Keep this at the left margin.
-libswanted_uselargefiles="`getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e
'[EMAIL PROTECTED]@@' -e 's@ -l@ @g`"
+libswanted_uselargefiles="`getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e
'[EMAIL PROTECTED]@@' -e 's@ -l@ @g'`"
fi
case "$ccflags_uselargefiles$ldflags_uselargefiles$libs_uselargefiles"
in
'') ;;
==== //depot/maint-5.10/perl/hints/aix_4.sh#3 (xtext) ====
Index: perl/hints/aix_4.sh
--- perl/hints/aix_4.sh#2~33288~ 2008-02-12 03:58:42.000000000 -0800
+++ perl/hints/aix_4.sh 2008-06-08 13:30:05.000000000 -0700
@@ -392,10 +392,10 @@
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
'[EMAIL PROTECTED]@@' -e 's@ -l@ @g`"
+libswanted_uselargefiles="`getconf XBS5_LP64_OFF64_LIBS 2>/dev/null|sed -e
'[EMAIL PROTECTED]@@' -e 's@ -l@ @g'`"
else
# Keep this at the left margin.
-libswanted_uselargefiles="`getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e
'[EMAIL PROTECTED]@@' -e 's@ -l@ @g`"
+libswanted_uselargefiles="`getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e
'[EMAIL PROTECTED]@@' -e 's@ -l@ @g'`"
fi
case "$ccflags_uselargefiles$ldflags_uselargefiles$libs_uselargefiles"
in
@@ -503,7 +503,7 @@
# 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 '[EMAIL
PROTECTED]@@' -e 's@ -l@ @g`"
+ qalibs="`getconf XBS5_LP64_OFF64_LIBS 2>/dev/null|sed -e '[EMAIL
PROTECTED]@@' -e 's@ -l@ @g'`"
# -q32 and -b32 may have been set by uselargefiles or user.
# Remove them.
ccflags="`echo $ccflags | sed -e '[EMAIL PROTECTED]@@'`"
End of Patch.
