Change 34274 by [EMAIL PROTECTED] on 2008/09/05 14:42:01
Integrate:
[ 34120]
Subject: [PATCH] Configure - d_sprintf_returns_strlen
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Thu, 19 Jun 2008 11:22:58 -0400
Message-ID: <[EMAIL PROTECTED]>
[ 34126]
Subject: [PATCH] Fix to Change 34120
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Fri, 11 Jul 2008 08:59:24 -0400
Message-ID: <[EMAIL PROTECTED]>
[ 34188]
Subject: [perl #24198] Bad default-domainname extraction in
Configure-Script may cause infinite loops in perl-tests
From: "Bram via RT" <[EMAIL PROTECTED]>
Date: Thu, 07 Aug 2008 06:00:47 -0700
Message-ID: <[EMAIL PROTECTED]>
[ 34212]
If I want to build Devel::NYTProf under the core tree, then the
Makefile needs to know to build List::Util first.
Affected files ...
... //depot/maint-5.10/perl/Configure#11 integrate
... //depot/maint-5.10/perl/Makefile.SH#8 integrate
Differences ...
==== //depot/maint-5.10/perl/Configure#11 (xtext) ====
Index: perl/Configure
--- perl/Configure#10~33955~ 2008-05-30 18:54:46.000000000 -0700
+++ perl/Configure 2008-09-05 07:42:01.000000000 -0700
@@ -25,7 +25,7 @@
# $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $
#
-# Generated on Tue May 27 17:17:47 CEST 2008 [metaconfig 3.5 PL0]
+# Generated on Fri Aug 8 16:16:43 CEST 2008 [metaconfig 3.5 PL0]
# (with additional metaconfig patches by [EMAIL PROTECTED])
cat >c1$$ <<EOF
@@ -8698,11 +8698,11 @@
echo "(Attempting domain name extraction from
$tans)"
dflt=.`$sed -n -e 's/ / /g' \
-e 's/^search *\([^ ]*\).*/\1/p' $tans \
- | ./tr '[A-Z]' '[a-z]' 2>/dev/null`
+ -e 1q 2>/dev/null`
case "$dflt" in
.) dflt=.`$sed -n -e 's/ / /g' \
-e 's/^domain *\([^ ]*\).*/\1/p' $tans \
- | ./tr '[A-Z]' '[a-z]' 2>/dev/null`
+ -e 1q 2>/dev/null`
;;
esac
fi
@@ -17457,7 +17457,6 @@
EOP
set try
-d_sprintf_returns_strlen="$undef"
if eval $compile; then
xxx="`$run ./try`"
case "$?" in
@@ -17472,6 +17471,9 @@
d_sprintf_returns_strlen="$undef"
;;
esac
+else
+ echo "(I can't seem to compile the test program--assuming it doesn't)" >&4
+ d_sprintf_returns_strlen="$undef"
fi
$rm_try
==== //depot/maint-5.10/perl/Makefile.SH#8 (text) ====
Index: perl/Makefile.SH
--- perl/Makefile.SH#7~33972~ 2008-05-31 16:40:24.000000000 -0700
+++ perl/Makefile.SH 2008-09-05 07:42:01.000000000 -0700
@@ -164,7 +164,7 @@
: Parallel makes reveal that we have some interdependencies
case $f in
- Math/BigInt/FastCalc) extra_dep="$extra_dep
+ Math/BigInt/FastCalc|Devel/NYTProf) extra_dep="$extra_dep
$this_target: lib/auto/List/Util/Util.$dlext" ;;
Unicode/Normalize) extra_dep="$extra_dep
$this_target: uni.data" ;;
End of Patch.
