diff options
author | H.Merijn Brand <h.m.brand@xs4all.nl> | 2008-11-28 07:52:03 +0000 |
---|---|---|
committer | H.Merijn Brand <h.m.brand@xs4all.nl> | 2008-11-28 07:52:03 +0000 |
commit | 1be1b388c18674b89d106c333a2dd62d9b736e29 (patch) | |
tree | 20f1738b9d97f5d73f13fd8995d64d7cfcfac27a | |
parent | a76803d0125ec59190f50d15fec54fdd46a08ffb (diff) | |
download | perl-1be1b388c18674b89d106c333a2dd62d9b736e29.tar.gz |
could we add usedevel to config.h?
From: Nicholas Clark <nick@ccl4.org>
Date: Thu, 27 Nov 2008 20:28:08 +0000
Message-ID: <20081127202807.GG49335@plum.flirble.org>
Subject: Avoid duplicate vendorlib [PATCH]
From: Gisle Aas <gisle@activestate.com>
Date: Wed, 12 Nov 2008 13:50:34 +0100
Message-Id: <71B06786-4C55-4A76-BE24-C01F89015D45@activestate.com>
p4raw-id: //depot/perl@34950
-rwxr-xr-x | Configure | 13 | ||||
-rw-r--r-- | Cross/config.sh-arm-linux | 1 | ||||
-rw-r--r-- | NetWare/config.wc | 1 | ||||
-rw-r--r-- | Porting/Glossary | 4 | ||||
-rw-r--r-- | config_h.SH | 7 | ||||
-rw-r--r-- | configure.com | 1 | ||||
-rw-r--r-- | epoc/config.sh | 1 | ||||
-rw-r--r-- | perl.c | 3 | ||||
-rw-r--r-- | plan9/config_sh.sample | 1 | ||||
-rw-r--r-- | symbian/config.sh | 1 | ||||
-rwxr-xr-x | uconfig.sh | 1 | ||||
-rw-r--r-- | win32/config.bc | 1 | ||||
-rw-r--r-- | win32/config.ce | 1 | ||||
-rw-r--r-- | win32/config.gc | 1 | ||||
-rw-r--r-- | win32/config.vc | 1 | ||||
-rw-r--r-- | win32/config.vc64 | 1 |
16 files changed, 37 insertions, 2 deletions
@@ -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 perlbug@perl.org) cat >c1$$ <<EOF @@ -209,6 +209,7 @@ to='' usecrosscompile='' extern_C='' mistrustnm='' +usedevel='' perllibs='' dynamic_ext='' extensions='' @@ -2142,7 +2143,8 @@ EOF : 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 @@ EOH esac ;; esac + usedevel="$undef" ;; esac case "$usedevel" in @@ -7019,6 +7022,11 @@ case "$vendorprefix" in 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 @@ use5005threads='$use5005threads' use64bitall='$use64bitall' use64bitint='$use64bitint' usecrosscompile='$usecrosscompile' +usedevel='$usedevel' usedl='$usedl' usedtrace='$usedtrace' usefaststdio='$usefaststdio' diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux index 3d12ea52f6..d550263432 100644 --- a/Cross/config.sh-arm-linux +++ b/Cross/config.sh-arm-linux @@ -1004,6 +1004,7 @@ use5005threads='undef' use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='define' diff --git a/NetWare/config.wc b/NetWare/config.wc index be85877621..4907437177 100644 --- a/NetWare/config.wc +++ b/NetWare/config.wc @@ -968,6 +968,7 @@ use5005threads='undef' use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='undef' diff --git a/Porting/Glossary b/Porting/Glossary index 8f0cdcec96..27000735da 100644 --- a/Porting/Glossary +++ b/Porting/Glossary @@ -4890,6 +4890,10 @@ usecrosscompile (Cross.U): 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. diff --git a/config_h.SH b/config_h.SH index a01f274fda..7706b72a6a 100644 --- a/config_h.SH +++ b/config_h.SH @@ -3297,6 +3297,13 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un */ #$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. diff --git a/configure.com b/configure.com index e0f330be35..e46cab636a 100644 --- a/configure.com +++ b/configure.com @@ -3169,6 +3169,7 @@ $ THEN d_mymalloc="define" $ 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;}""" diff --git a/epoc/config.sh b/epoc/config.sh index 0ea22e26fb..601ab45193 100644 --- a/epoc/config.sh +++ b/epoc/config.sh @@ -873,6 +873,7 @@ uniq='uniq' use64bitall='undef' use64bitint='undef' usecrosscompile='define' +usedevel='undef' usedl='undef' usedtrace='undef' usefaststdio='undef' @@ -1876,6 +1876,9 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) # 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 diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample index 10b6b1cc82..d2b6544fd3 100644 --- a/plan9/config_sh.sample +++ b/plan9/config_sh.sample @@ -975,6 +975,7 @@ use5005threads='undef' use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='undef' usedtrace='undef' usefaststdio='undef' diff --git a/symbian/config.sh b/symbian/config.sh index 40d7c5a9b3..8b2cd4aaab 100644 --- a/symbian/config.sh +++ b/symbian/config.sh @@ -790,6 +790,7 @@ use5005threads='undef' use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='undef' usedtrace='undef' usefaststdio='undef' diff --git a/uconfig.sh b/uconfig.sh index 68702f9513..c0a749e404 100755 --- a/uconfig.sh +++ b/uconfig.sh @@ -756,6 +756,7 @@ use5005threads='undef' use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='undef' usedtrace='undef' usefaststdio='undef' diff --git a/win32/config.bc b/win32/config.bc index cee153e9ad..5bded78b16 100644 --- a/win32/config.bc +++ b/win32/config.bc @@ -998,6 +998,7 @@ use5005threads='undef' use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='undef' diff --git a/win32/config.ce b/win32/config.ce index c6ee19c111..8e3396892e 100644 --- a/win32/config.ce +++ b/win32/config.ce @@ -960,6 +960,7 @@ use5005threads='undef' use64bitall='undef' use64bitint='undef' usecrosscompile='define' +usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='undef' diff --git a/win32/config.gc b/win32/config.gc index ee42db828f..5c39929f01 100644 --- a/win32/config.gc +++ b/win32/config.gc @@ -998,6 +998,7 @@ use5005threads='undef' use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='undef' diff --git a/win32/config.vc b/win32/config.vc index a56d7e2e42..5990a1cd27 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -998,6 +998,7 @@ use5005threads='undef' use64bitall='undef' use64bitint='undef' usecrosscompile='undef' +usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='undef' diff --git a/win32/config.vc64 b/win32/config.vc64 index 29db12cc6a..4a864eac23 100644 --- a/win32/config.vc64 +++ b/win32/config.vc64 @@ -998,6 +998,7 @@ use5005threads='undef' use64bitall='undef' use64bitint='define' usecrosscompile='undef' +usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='undef' |