Change 34950 by [EMAIL PROTECTED] on 2008/11/28 07:52:03 Subject: could we add usedevel to config.h? From: Nicholas Clark <[EMAIL PROTECTED]> Date: Thu, 27 Nov 2008 20:28:08 +0000 Message-ID: <[EMAIL PROTECTED]> Subject: Avoid duplicate vendorlib [PATCH] From: Gisle Aas <[EMAIL PROTECTED]> Date: Wed, 12 Nov 2008 13:50:34 +0100 Message-Id: <[EMAIL PROTECTED]>
Affected files ... ... //depot/perl/Configure#712 edit ... //depot/perl/Cross/config.sh-arm-linux#33 edit ... //depot/perl/NetWare/config.wc#46 edit ... //depot/perl/Porting/Glossary#198 edit ... //depot/perl/config_h.SH#352 edit ... //depot/perl/configure.com#288 edit ... //depot/perl/epoc/config.sh#108 edit ... //depot/perl/perl.c#890 edit ... //depot/perl/plan9/config_sh.sample#25 edit ... //depot/perl/symbian/config.sh#31 edit ... //depot/perl/uconfig.sh#90 edit ... //depot/perl/win32/config.bc#189 edit ... //depot/perl/win32/config.ce#18 edit ... //depot/perl/win32/config.gc#186 edit ... //depot/perl/win32/config.vc#196 edit ... //depot/perl/win32/config.vc64#66 edit Differences ... ==== //depot/perl/Configure#712 (xtext) ==== Index: perl/Configure --- perl/Configure#711~34756~ 2008-11-06 12:18:08.000000000 -0800 +++ perl/Configure 2008-11-27 23:52:03.000000000 -0800 @@ -25,7 +25,7 @@ # $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $ # -# Generated on Thu Nov 6 21:06:19 CET 2008 [metaconfig 3.5 PL0] +# Generated on Fri Nov 28 08:39:51 CET 2008 [metaconfig 3.5 PL0] # (with additional metaconfig patches by [EMAIL PROTECTED]) cat >c1$$ <<EOF @@ -209,6 +209,7 @@ usecrosscompile='' extern_C='' mistrustnm='' +usedevel='' perllibs='' dynamic_ext='' extensions='' @@ -2142,7 +2143,8 @@ : See if we are using a devel version and want that xversion=`awk '/define[ ]+PERL_VERSION/ {print $3}' $rsrc/patchlevel.h` case "$usedevel" in -$define|true|[yY]*) ;; +$define|true|[yY]*) + usedevel="$define" ;; *) case "$xversion" in *[13579]) cat >&4 <<EOH @@ -2175,6 +2177,7 @@ esac ;; esac + usedevel="$undef" ;; esac case "$usedevel" in @@ -7019,6 +7022,11 @@ esac prefixvar=vendorarch . ./installprefix +if $test X"$vendorarch" = X"$vendorlib"; then + d_vendorarch="$undef" +else + d_vendorarch="$define" +fi : Final catch-all directories to search $cat <<EOM @@ -23028,6 +23036,7 @@ use64bitall='$use64bitall' use64bitint='$use64bitint' usecrosscompile='$usecrosscompile' +usedevel='$usedevel' usedl='$usedl' usedtrace='$usedtrace' usefaststdio='$usefaststdio' ==== //depot/perl/Cross/config.sh-arm-linux#33 (text) ==== Index: perl/Cross/config.sh-arm-linux --- perl/Cross/config.sh-arm-linux#32~34777~ 2008-11-08 05:06:53.000000000 -0800 +++ perl/Cross/config.sh-arm-linux 2008-11-27 23:52:03.000000000 -0800 @@ -1004,6 +1004,7 @@ use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='define' ==== //depot/perl/NetWare/config.wc#46 (text) ==== Index: perl/NetWare/config.wc --- perl/NetWare/config.wc#45~34777~ 2008-11-08 05:06:53.000000000 -0800 +++ perl/NetWare/config.wc 2008-11-27 23:52:03.000000000 -0800 @@ -968,6 +968,7 @@ use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='undef' ==== //depot/perl/Porting/Glossary#198 (text) ==== Index: perl/Porting/Glossary --- perl/Porting/Glossary#197~34756~ 2008-11-06 12:18:08.000000000 -0800 +++ perl/Porting/Glossary 2008-11-27 23:52:03.000000000 -0800 @@ -4890,6 +4890,10 @@ This variable conditionally defines the USE_CROSS_COMPILE symbol, and indicates that Perl has been cross-compiled. +usedevel (Devel.U): + This variable indicates that Perl was configured with development + features enabled. This should not be done for production builds. + usedl (dlsrc.U): This variable indicates if the system supports dynamic loading of some sort. See also dlsrc and dlobj. ==== //depot/perl/config_h.SH#352 (text) ==== Index: perl/config_h.SH --- perl/config_h.SH#351~34756~ 2008-11-06 12:18:08.000000000 -0800 +++ perl/config_h.SH 2008-11-27 23:52:03.000000000 -0800 @@ -3297,6 +3297,13 @@ */ #$ebcdic EBCDIC /**/ +/* PERL_USE_DEVEL: + * This symbol, if defined, indicates that Perl was configured with + * -Dusedevel, to enable development features. This should not be + * done for production builds. + */ +#$usedevel PERL_USE_DEVEL /**/ + /* HAS_ATOLF: * This symbol, if defined, indicates that the atolf routine is * available to convert strings into long doubles. ==== //depot/perl/configure.com#288 (text) ==== Index: perl/configure.com --- perl/configure.com#287~34771~ 2008-11-07 16:13:43.000000000 -0800 +++ perl/configure.com 2008-11-27 23:52:03.000000000 -0800 @@ -3169,6 +3169,7 @@ $ ELSE d_mymalloc="undef" $ ENDIF $! +$ usedevel="undef" $ usedl="define" $ startperl="""$ perl 'f$env(\""procedure\"")' \""'"+"'p1'\"" \""'"+"'p2'\"" \""'"+"'p3'\"" \""'"+"'p4'\"" \""'"+"'p5'\"" \""'"+"'p6'\"" \""'"+"'p7'\"" \""'"+"'p8'\""!\n" $ startperl=startperl + "$ exit++ + ++$status!=0 and $exit=$status=undef; while($#ARGV != -1 and $ARGV[$#ARGV] eq '"+"'){pop @ARGV;}""" ==== //depot/perl/epoc/config.sh#108 (text) ==== Index: perl/epoc/config.sh --- perl/epoc/config.sh#107~34777~ 2008-11-08 05:06:53.000000000 -0800 +++ perl/epoc/config.sh 2008-11-27 23:52:03.000000000 -0800 @@ -873,6 +873,7 @@ use64bitall='undef' use64bitint='undef' usecrosscompile='define' +usedevel='undef' usedl='undef' usedtrace='undef' usefaststdio='undef' ==== //depot/perl/perl.c#890 (text) ==== Index: perl/perl.c --- perl/perl.c#889~34927~ 2008-11-26 12:29:58.000000000 -0800 +++ perl/perl.c 2008-11-27 23:52:03.000000000 -0800 @@ -1876,6 +1876,9 @@ # ifdef PERL_MEM_LOG_TIMESTAMP " PERL_MEM_LOG_TIMESTAMP" # endif +# ifdef PERL_USE_DEVEL + " PERL_USE_DEVEL" +# endif # ifdef PERL_USE_SAFE_PUTENV " PERL_USE_SAFE_PUTENV" # endif ==== //depot/perl/plan9/config_sh.sample#25 (text) ==== Index: perl/plan9/config_sh.sample --- perl/plan9/config_sh.sample#24~34777~ 2008-11-08 05:06:53.000000000 -0800 +++ perl/plan9/config_sh.sample 2008-11-27 23:52:03.000000000 -0800 @@ -975,6 +975,7 @@ use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='undef' usedtrace='undef' usefaststdio='undef' ==== //depot/perl/symbian/config.sh#31 (text) ==== Index: perl/symbian/config.sh --- perl/symbian/config.sh#30~34777~ 2008-11-08 05:06:53.000000000 -0800 +++ perl/symbian/config.sh 2008-11-27 23:52:03.000000000 -0800 @@ -790,6 +790,7 @@ use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='undef' usedtrace='undef' usefaststdio='undef' ==== //depot/perl/uconfig.sh#90 (xtext) ==== Index: perl/uconfig.sh --- perl/uconfig.sh#89~34777~ 2008-11-08 05:06:53.000000000 -0800 +++ perl/uconfig.sh 2008-11-27 23:52:03.000000000 -0800 @@ -756,6 +756,7 @@ use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='undef' usedtrace='undef' usefaststdio='undef' ==== //depot/perl/win32/config.bc#189 (text) ==== Index: perl/win32/config.bc --- perl/win32/config.bc#188~34777~ 2008-11-08 05:06:53.000000000 -0800 +++ perl/win32/config.bc 2008-11-27 23:52:03.000000000 -0800 @@ -998,6 +998,7 @@ use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='undef' ==== //depot/perl/win32/config.ce#18 (text) ==== Index: perl/win32/config.ce --- perl/win32/config.ce#17~34777~ 2008-11-08 05:06:53.000000000 -0800 +++ perl/win32/config.ce 2008-11-27 23:52:03.000000000 -0800 @@ -960,6 +960,7 @@ use64bitall='undef' use64bitint='undef' usecrosscompile='define' +usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='undef' ==== //depot/perl/win32/config.gc#186 (text) ==== Index: perl/win32/config.gc --- perl/win32/config.gc#185~34777~ 2008-11-08 05:06:53.000000000 -0800 +++ perl/win32/config.gc 2008-11-27 23:52:03.000000000 -0800 @@ -998,6 +998,7 @@ use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='undef' ==== //depot/perl/win32/config.vc#196 (text) ==== Index: perl/win32/config.vc --- perl/win32/config.vc#195~34823~ 2008-11-12 04:30:19.000000000 -0800 +++ perl/win32/config.vc 2008-11-27 23:52:03.000000000 -0800 @@ -998,6 +998,7 @@ use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='undef' ==== //depot/perl/win32/config.vc64#66 (text) ==== Index: perl/win32/config.vc64 --- perl/win32/config.vc64#65~34823~ 2008-11-12 04:30:19.000000000 -0800 +++ perl/win32/config.vc64 2008-11-27 23:52:03.000000000 -0800 @@ -998,6 +998,7 @@ use64bitall='undef' use64bitint='define' usecrosscompile='undef' +usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='undef' End of Patch.