Change 33894 by [EMAIL PROTECTED] on 2008/05/20 23:39:57
Integrate:
[ 33547]
Final move from meta-3.0 to meta-3.5
[ 33589]
Make uudmap.h dependencies more explicit in the VMS build
(needed by MMS but not MMK).
[ 33597]
Add i_syspoll to all the pre-canned configs.
[ 33598]
Subject: [PATCH] Re: Smoke [5.11.0] 33456 PASS darwin 9.2.0 (macppcG5/1
cpu)
From: Dominic Dunlop <[EMAIL PROTECTED]>
Message-Id: <[EMAIL PROTECTED]>
Date: Tue, 11 Mar 2008 21:54:04 +0100
[but rename ******* to i_mallocmalloc.U, and then fix up all the files
that Porting/checkcfgvar.pl says need i_mallocmalloc declared]
[ 33606]
Subject: detecting Configure test goofs (Was Re: branch prediction
hints)
From: Nicholas Clark <[EMAIL PROTECTED]>
Date: Mon, 24 Mar 2008 16:35:09 +0000
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.10/perl/Configure#8 integrate
... //depot/maint-5.10/perl/Cross/config.sh-arm-linux#5 integrate
... //depot/maint-5.10/perl/NetWare/config.wc#5 integrate
... //depot/maint-5.10/perl/Porting/Glossary#6 integrate
... //depot/maint-5.10/perl/Porting/config.sh#5 integrate
... //depot/maint-5.10/perl/config_h.SH#6 integrate
... //depot/maint-5.10/perl/configure.com#8 integrate
... //depot/maint-5.10/perl/epoc/config.sh#5 integrate
... //depot/maint-5.10/perl/perl.h#11 integrate
... //depot/maint-5.10/perl/plan9/config_sh.sample#5 integrate
... //depot/maint-5.10/perl/symbian/config.sh#5 integrate
... //depot/maint-5.10/perl/uconfig.sh#6 integrate
... //depot/maint-5.10/perl/vms/descrip_mms.template#3 integrate
... //depot/maint-5.10/perl/win32/config.bc#5 integrate
... //depot/maint-5.10/perl/win32/config.ce#5 integrate
... //depot/maint-5.10/perl/win32/config.gc#6 integrate
... //depot/maint-5.10/perl/win32/config.vc#6 integrate
... //depot/maint-5.10/perl/win32/config.vc64#6 integrate
Differences ...
==== //depot/maint-5.10/perl/Configure#8 (xtext) ====
Index: perl/Configure
--- perl/Configure#7~33877~ 2008-05-20 02:41:34.000000000 -0700
+++ perl/Configure 2008-05-20 16:39:57.000000000 -0700
@@ -25,7 +25,7 @@
# $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $
#
-# Generated on Fri Feb 15 17:37:37 CET 2008 [metaconfig 3.0 PL70]
+# Generated on Sun Mar 30 11:17:56 CEST 2008 [metaconfig 3.5 PL0]
# (with additional metaconfig patches by [EMAIL PROTECTED])
cat >c1$$ <<EOF
@@ -869,6 +869,7 @@
i_locale=''
i_machcthr=''
i_malloc=''
+i_mallocmalloc=''
i_math=''
i_memory=''
i_mntent=''
@@ -912,6 +913,7 @@
i_sysmount=''
i_sysndir=''
i_sysparam=''
+i_syspoll=''
i_sysresrc=''
i_syssecrt=''
i_sysselct=''
@@ -1646,7 +1648,7 @@
esac
shift
;;
- -V) echo "$me generated by metaconfig 3.0 PL70." >&2
+ -V) echo "$me generated by metaconfig 3.5 PL0." >&2
exit 0;;
--) break;;
-*) echo "$me: unknown option $1" >&2; shift; error=true;;
@@ -4012,7 +4014,7 @@
esac
EOSC
-: function used to set $1 to $val
+: function used to set '$1' to '$val'
setvar='var=$1; eval "was=\$$1"; td=$define; tu=$undef;
case "$val$was" in
$define$undef) . ./whoa; eval "$var=\$td";;
@@ -5380,6 +5382,11 @@
compile='
mc_file=$1;
shift;
+case "$usedevel" in $define|true|[yY]*) if $test ! -f "${mc_file}.c"; then
+echo "Internal Configure script bug - compiler test file ${mc_file}.c is
missing. Please report this to [EMAIL PROTECTED]" >&4;
+exit 1;
+fi;
+esac;
$cc -o ${mc_file} $optimize $ccflags $ldflags $* ${mc_file}.c $libs >
/dev/null 2>&1;'
: define a shorthand compile call for compilations that should be ok.
compile_ok='
@@ -6549,6 +6556,10 @@
esac
$rm -f getverlist
+: see if malloc/malloc.h has to be included
+set malloc/malloc.h i_mallocmalloc
+eval $inhdr
+
: see if this is a malloc.h system
: we want a real compile instead of Inhdr because some systems have a
: malloc.h that just gives a compile error saying to use stdlib.h instead
@@ -6556,6 +6567,11 @@
$cat >try.c <<EOCP
#include <stdlib.h>
#include <malloc.h>
+$i_mallocmalloc I_MALLOCMALLOC
+#ifdef I_MALLOCMALLOC
+# include <malloc/malloc.h>
+#endif
+
int main () { return 0; }
EOCP
set try
@@ -12273,6 +12289,24 @@
eval $setvar
$rm_try
+: script used to emit important warnings
+cat >warn <<EOS
+$startsh
+if test \$# -gt 0; then
+ echo "\$@" >msg
+else
+ cat >msg
+fi
+echo "*** WARNING:" >&4
+sed -e 's/^/*** /' <msg >&4
+echo "*** " >&4
+cat msg >>config.msg
+echo " " >>config.msg
+rm -f msg
+EOS
+chmod +x warn
+$eunicefix warn
+
: see which of string.h or strings.h is needed
echo " "
strings=`./findhdr string.h`
@@ -12285,7 +12319,7 @@
if $test "$strings" && $test -r "$strings"; then
echo "Using <strings.h> instead of <string.h>." >&4
else
- echo "No string header found -- You'll surely have problems."
>&4
+ ./warn "No string header found -- You'll surely have problems."
fi
fi
set i_string
@@ -19631,6 +19665,7 @@
set mad
eval $setvar
+: check whether make sets MAKE
echo " "
echo "Checking if your $make program sets \$(MAKE)..." >&4
case "$make_set_make" in
@@ -21084,14 +21119,14 @@
echo "<sgtty.h> found." >&4
else
echo "System is pyramid with BSD universe."
- echo "<sgtty.h> not found--you could have
problems." >&4
+ ./warn "<sgtty.h> not found--you could have
problems."
fi;;
*) if $test `./findhdr termio.h`; then
val="$define"
echo "<termio.h> found." >&4
else
echo "System is pyramid with USG universe."
- echo "<termio.h> not found--you could have
problems." >&4
+ ./warn "<termio.h> not found--you could have
problems."
fi;;
esac
elif ./usg; then
@@ -21102,7 +21137,7 @@
echo "<sgtty.h> found." >&4
val2="$define"
else
-echo "Neither <termio.h> nor <sgtty.h> found--you could have problems." >&4
+ ./warn "Neither <termio.h> nor <sgtty.h> found--cross
fingers!"
fi
else
if $test `./findhdr sgtty.h`; then
@@ -21112,7 +21147,7 @@
echo "<termio.h> found." >&4
val="$define"
else
-echo "Neither <sgtty.h> nor <termio.h> found--you could have problems." >&4
+ ./warn "Neither <sgtty.h> nor <termio.h> found--cross
fingers!"
fi
fi;;
esac
@@ -21177,6 +21212,10 @@
set sys/mode.h i_sysmode
eval $inhdr
+: see if there is a sys/poll.h file
+set sys/poll.h i_syspoll
+eval $inhdr
+
: see if sys/resource.h has to be included
set sys/resource.h i_sysresrc
eval $inhdr
@@ -22329,6 +22368,7 @@
i_locale='$i_locale'
i_machcthr='$i_machcthr'
i_malloc='$i_malloc'
+i_mallocmalloc='$i_mallocmalloc'
i_math='$i_math'
i_memory='$i_memory'
i_mntent='$i_mntent'
@@ -22363,6 +22403,7 @@
i_sysmount='$i_sysmount'
i_sysndir='$i_sysndir'
i_sysparam='$i_sysparam'
+i_syspoll='$i_syspoll'
i_sysresrc='$i_sysresrc'
i_syssecrt='$i_syssecrt'
i_sysselct='$i_sysselct'
==== //depot/maint-5.10/perl/Cross/config.sh-arm-linux#5 (text) ====
Index: perl/Cross/config.sh-arm-linux
--- perl/Cross/config.sh-arm-linux#4~33877~ 2008-05-20 02:41:34.000000000
-0700
+++ perl/Cross/config.sh-arm-linux 2008-05-20 16:39:57.000000000 -0700
@@ -634,6 +634,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='define'
@@ -668,6 +669,7 @@
i_sysmount='define'
i_sysndir='undef'
i_sysparam='define'
+i_syspoll='undef'
i_sysresrc='define'
i_syssecrt='undef'
i_sysselct='define'
==== //depot/maint-5.10/perl/NetWare/config.wc#5 (text) ====
Index: perl/NetWare/config.wc
--- perl/NetWare/config.wc#4~33877~ 2008-05-20 02:41:34.000000000 -0700
+++ perl/NetWare/config.wc 2008-05-20 16:39:57.000000000 -0700
@@ -617,6 +617,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
@@ -651,6 +652,7 @@
i_sysmount='undef'
i_sysndir='undef'
i_sysparam='undef'
+i_syspoll='undef'
i_sysresrc='undef'
i_syssecrt='undef'
i_sysselct='undef'
==== //depot/maint-5.10/perl/Porting/Glossary#6 (text) ====
Index: perl/Porting/Glossary
--- perl/Porting/Glossary#5~33877~ 2008-05-20 02:41:34.000000000 -0700
+++ perl/Porting/Glossary 2008-05-20 16:39:57.000000000 -0700
@@ -2923,6 +2923,10 @@
This variable conditionally defines the I_MALLOC symbol, and indicates
whether a C program should include <malloc.h>.
+i_mallocmalloc (i_mallocmalloc.U):
+ This variable conditionally defines the I_MALLOCMALLOC symbol,
+ and indicates whether a C program should include <malloc/malloc.h>.
+
i_math (i_math.U):
This variable conditionally defines the I_MATH symbol, and indicates
whether a C program may include <math.h>.
@@ -3070,6 +3074,10 @@
This variable conditionally defines the I_SYS_PARAM symbol, and
indicates
whether a C program should include <sys/param.h>.
+i_syspoll (i_syspoll.U):
+ This variable conditionally defines the I_SYS_POLL symbol, which
+ indicates to the C program that it should include <sys/poll.h>.
+
i_sysresrc (i_sysresrc.U):
This variable conditionally defines the I_SYS_RESOURCE symbol,
and indicates whether a C program should include <sys/resource.h>.
==== //depot/maint-5.10/perl/Porting/config.sh#5 (text) ====
Index: perl/Porting/config.sh
--- perl/Porting/config.sh#4~33877~ 2008-05-20 02:41:34.000000000 -0700
+++ perl/Porting/config.sh 2008-05-20 16:39:57.000000000 -0700
@@ -647,6 +647,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='define'
@@ -680,6 +681,7 @@
i_sysmode='undef'
i_sysmount='define'
i_sysndir='undef'
+i_syspoll='define'
i_sysparam='define'
i_sysresrc='define'
i_syssecrt='undef'
==== //depot/maint-5.10/perl/config_h.SH#6 (text) ====
Index: perl/config_h.SH
--- perl/config_h.SH#5~33877~ 2008-05-20 02:41:34.000000000 -0700
+++ perl/config_h.SH 2008-05-20 16:39:57.000000000 -0700
@@ -689,6 +689,12 @@
*/
#$i_locale I_LOCALE /**/
+/* I_MALLOCMALLOC:
+ * This symbol, if defined, indicates to the C program that it should
+ * include <malloc/malloc.h>.
+ */
+#$i_mallocmalloc I_MALLOCMALLOC /**/
+
/* I_MATH:
* This symbol, if defined, indicates to the C program that it should
* include <math.h>.
@@ -766,6 +772,13 @@
*/
#$i_sysparam I_SYS_PARAM /**/
+/* I_SYS_POLL:
+ * This symbol, if defined, indicates that the program may include
+ * <sys/poll.h>. When I_POLL is also defined, it's probably safest
+ * to only include <poll.h>.
+ */
+#$i_syspoll I_SYS_POLL /**/
+
/* I_SYS_RESOURCE:
* This symbol, if defined, indicates to the C program that it should
* include <sys/resource.h>.
==== //depot/maint-5.10/perl/configure.com#8 (text) ====
Index: perl/configure.com
--- perl/configure.com#7~33893~ 2008-05-20 16:11:00.000000000 -0700
+++ perl/configure.com 2008-05-20 16:39:57.000000000 -0700
@@ -6241,6 +6241,7 @@
$ WC "i_locale='" + i_locale + "'"
$ WC "i_machcthr='undef'"
$ WC "i_machcthreads='undef'"
+$ WC "i_mallocmalloc='undef'"
$ WC "i_math='define'"
$ WC "i_memory='undef'"
$ WC "i_mntent='undef'"
==== //depot/maint-5.10/perl/epoc/config.sh#5 (text) ====
Index: perl/epoc/config.sh
--- perl/epoc/config.sh#4~33877~ 2008-05-20 02:41:34.000000000 -0700
+++ perl/epoc/config.sh 2008-05-20 16:39:57.000000000 -0700
@@ -580,6 +580,7 @@
i_locale='undef'
i_machcthr='undef'
i_malloc='undef'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
@@ -612,6 +613,7 @@
i_sysmount='undef'
i_sysndir='undef'
i_sysparam='define'
+i_syspoll='undef'
i_sysresrc='define'
i_syssecrt='undef'
i_sysselct='undef'
==== //depot/maint-5.10/perl/perl.h#11 (text) ====
Index: perl/perl.h
--- perl/perl.h#10~33802~ 2008-05-10 07:15:40.000000000 -0700
+++ perl/perl.h 2008-05-20 16:39:57.000000000 -0700
@@ -4060,6 +4060,11 @@
# define INIT_TRACK_MEMPOOL(header, interp)
#endif
+#ifdef I_MALLOCMALLOC
+/* Needed for malloc_size(), malloc_good_size() on some systems */
+# include <malloc/malloc.h>
+#endif
+
typedef int (CPERLscope(*runops_proc_t)) (pTHX);
typedef void (CPERLscope(*share_proc_t)) (pTHX_ SV *sv);
==== //depot/maint-5.10/perl/plan9/config_sh.sample#5 (text) ====
Index: perl/plan9/config_sh.sample
--- perl/plan9/config_sh.sample#4~33877~ 2008-05-20 02:41:34.000000000
-0700
+++ perl/plan9/config_sh.sample 2008-05-20 16:39:57.000000000 -0700
@@ -628,6 +628,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='undef'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
@@ -662,6 +663,7 @@
i_sysmount='undef'
i_sysndir='undef'
i_sysparam='define'
+i_syspoll='undef'
i_sysresrc='define'
i_syssecrt='undef'
i_sysselct='define'
==== //depot/maint-5.10/perl/symbian/config.sh#5 (text) ====
Index: perl/symbian/config.sh
--- perl/symbian/config.sh#4~33877~ 2008-05-20 02:41:34.000000000 -0700
+++ perl/symbian/config.sh 2008-05-20 16:39:57.000000000 -0700
@@ -555,6 +555,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='undef'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
@@ -589,6 +590,7 @@
i_sysmount='undef'
i_sysndir='undef'
i_sysparam='undef'
+i_syspoll='undef'
i_sysresrc='undef'
i_syssecrt='undef'
i_sysselct='undef'
==== //depot/maint-5.10/perl/uconfig.sh#6 (xtext) ====
Index: perl/uconfig.sh
--- perl/uconfig.sh#5~33877~ 2008-05-20 02:41:34.000000000 -0700
+++ perl/uconfig.sh 2008-05-20 16:39:57.000000000 -0700
@@ -542,6 +542,7 @@
i_locale='undef'
i_machcthr='undef'
i_malloc='undef'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
@@ -576,6 +577,7 @@
i_sysmount='undef'
i_sysndir='undef'
i_sysparam='undef'
+i_syspoll='undef'
i_sysresrc='undef'
i_syssecrt='undef'
i_sysselct='undef'
==== //depot/maint-5.10/perl/vms/descrip_mms.template#3 (text) ====
Index: perl/vms/descrip_mms.template
--- perl/vms/descrip_mms.template#2~32697~ 2007-12-22 02:26:16.000000000
-0800
+++ perl/vms/descrip_mms.template 2008-05-20 16:39:57.000000000 -0700
@@ -464,8 +464,6 @@
$(DBG)perlshr$(E) : $(DBG)libperl$(OLB) $(extobj) $(DBG)perlshr_xtras.ts
Link $(LINKFLAGS)/Share=$(MMS$TARGET) $(extobj)
[]$(DBG)perlshr_bld.opt/Option, perlshr_attr.opt/Option
-globals$(O) : uudmap.h
-
uudmap.h : generate_uudmap$(E)
DEFINE/USER_MODE SYS$OUTPUT uudmap.h
MCR SYS$DISK:[]generate_uudmap$(E)
@@ -473,6 +471,9 @@
generate_uudmap$(E) : generate_uudmap$(O) $(CRTL)
Link $(LINKFLAGS)/NoDebug/Trace/NoMap/NoFull/NoCross/Exe=$(MMS$TARGET)
generate_uudmap$(O) $(CRTLOPTS)
+generate_uudmap$(O) : generate_uudmap.c
+ $(CC) $(CORECFLAGS) $(MMS$SOURCE)
+
# The following files are built in one go by gen_shrfls.pl:
# perlshr_attr.opt, $(DBG)perlshr_bld.opt - VAX and AXP
# perlshr_gbl*.mar, perlshr_gbl*$(O) - VAX only
@@ -1643,8 +1644,8 @@
$(CC) $(CORECFLAGS) $(MMS$SOURCE)
dump$(O) : dump.c $(h)
$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-globals$(O) : globals.c $(h)
- $(CC) $(CORECFLAGS) $(MMS$SOURCE)
+globals$(O) : globals.c uudmap.h $(h)
+ $(CC) $(CORECFLAGS) $(MMS$SOURCE)
gv$(O) : gv.c $(h)
$(CC) $(CORECFLAGS) $(MMS$SOURCE)
mro$(O) : mro.c $(h)
==== //depot/maint-5.10/perl/win32/config.bc#5 (text) ====
Index: perl/win32/config.bc
--- perl/win32/config.bc#4~33877~ 2008-05-20 02:41:34.000000000 -0700
+++ perl/win32/config.bc 2008-05-20 16:39:57.000000000 -0700
@@ -622,6 +622,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
@@ -656,6 +657,7 @@
i_sysmount='undef'
i_sysndir='undef'
i_sysparam='undef'
+i_syspoll='undef'
i_sysresrc='undef'
i_syssecrt='undef'
i_sysselct='undef'
==== //depot/maint-5.10/perl/win32/config.ce#5 (text) ====
Index: perl/win32/config.ce
--- perl/win32/config.ce#4~33877~ 2008-05-20 02:41:34.000000000 -0700
+++ perl/win32/config.ce 2008-05-20 16:39:57.000000000 -0700
@@ -615,6 +615,7 @@
i_locale='undef'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
@@ -649,6 +650,7 @@
i_sysmount='undef'
i_sysndir='undef'
i_sysparam='undef'
+i_syspoll='undef'
i_sysresrc='undef'
i_syssecrt='undef'
i_sysselct='undef'
==== //depot/maint-5.10/perl/win32/config.gc#6 (text) ====
Index: perl/win32/config.gc
--- perl/win32/config.gc#5~33892~ 2008-05-20 16:03:07.000000000 -0700
+++ perl/win32/config.gc 2008-05-20 16:39:57.000000000 -0700
@@ -622,6 +622,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
@@ -656,6 +657,7 @@
i_sysmount='undef'
i_sysndir='undef'
i_sysparam='undef'
+i_syspoll='undef'
i_sysresrc='undef'
i_syssecrt='undef'
i_sysselct='undef'
==== //depot/maint-5.10/perl/win32/config.vc#6 (text) ====
Index: perl/win32/config.vc
--- perl/win32/config.vc#5~33892~ 2008-05-20 16:03:07.000000000 -0700
+++ perl/win32/config.vc 2008-05-20 16:39:57.000000000 -0700
@@ -622,6 +622,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
@@ -656,6 +657,7 @@
i_sysmount='undef'
i_sysndir='undef'
i_sysparam='undef'
+i_syspoll='undef'
i_sysresrc='undef'
i_syssecrt='undef'
i_sysselct='undef'
==== //depot/maint-5.10/perl/win32/config.vc64#6 (text) ====
Index: perl/win32/config.vc64
--- perl/win32/config.vc64#5~33892~ 2008-05-20 16:03:07.000000000 -0700
+++ perl/win32/config.vc64 2008-05-20 16:39:57.000000000 -0700
@@ -622,6 +622,7 @@
i_locale='define'
i_machcthr='undef'
i_malloc='define'
+i_mallocmalloc='undef'
i_math='define'
i_memory='undef'
i_mntent='undef'
@@ -656,6 +657,7 @@
i_sysmount='undef'
i_sysndir='undef'
i_sysparam='undef'
+i_syspoll='undef'
i_sysresrc='undef'
i_syssecrt='undef'
i_sysselct='undef'
End of Patch.
