This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Store the BM table in mg_ptr instead of after SvCUR().
[perl5.git]
/
Makefile.SH
diff --git
a/Makefile.SH
b/Makefile.SH
index
2aca5cd
..
8c17ac2
100755
(executable)
--- a/
Makefile.SH
+++ b/
Makefile.SH
@@
-164,6
+164,16
@@
EOT
;;
esac
;;
esac
+: is Cwd static or dynamic
+static_cwd='define'
+list_util_dep='$(PERL_EXE)'
+for f in $dynamic_ext; do
+ case $f in
+ Cwd) static_cwd='undef' ;;
+ List/Util) list_util_dep=lib/auto/List/Util/Util.$dlext
+ esac
+done
+
: Prepare dependency lists for Makefile.
dynamic_list=' '
dynamic_ext_re="lib/auto/re/re.$dlext"
: Prepare dependency lists for Makefile.
dynamic_list=' '
dynamic_ext_re="lib/auto/re/re.$dlext"
@@
-176,16
+186,10
@@
for f in $dynamic_ext; do
: Parallel makes reveal that we have some interdependencies
case $f in
: Parallel makes reveal that we have some interdependencies
case $f in
- Encode) extra_dep="$extra_dep
-$this_target: lib/auto/Cwd/Cwd.$dlext" ;;
Math/BigInt/FastCalc|Devel/NYTProf) extra_dep="$extra_dep
Math/BigInt/FastCalc|Devel/NYTProf) extra_dep="$extra_dep
-$this_target:
lib/auto/List/Util/Util.$dlext
" ;;
+$this_target:
$list_util_dep
" ;;
Unicode/Normalize) extra_dep="$extra_dep
$this_target: uni.data" ;;
Unicode/Normalize) extra_dep="$extra_dep
$this_target: uni.data" ;;
- Text/ParseWords) extra_dep="$extra_dep
-$this_target: lib/auto/Scalar/Util.$dlext" ;;
- SDBM_File) extra_dep="$extra_dep
-$this_target: lib/auto/Cwd/Cwd.$dlext" ;;
esac
done
esac
done
@@
-462,7
+466,7
@@
mini_obj = $(minindt_obj) $(MINIDTRACE_O)
ndt_obj = $(obj0) $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
obj = $(ndt_obj) $(DTRACE_O)
ndt_obj = $(obj0) $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
obj = $(ndt_obj) $(DTRACE_O)
-perltoc_pod_prereqs = extra.pods pod/perl51
31
0delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod
+perltoc_pod_prereqs = extra.pods pod/perl51
5
0delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod
generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs)
Icwd = -Idist/Cwd -Idist/Cwd/lib
generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs)
Icwd = -Idist/Cwd -Idist/Cwd/lib
@@
-555,11
+559,15
@@
perl$(OBJ_EXT): git_version.h
# Making utilities and translators require Cwd. If we have dynamic
# loading, we only need miniperl and Cwd.$dlext. If we have static
# loading, we need to build perl first.
# Making utilities and translators require Cwd. If we have dynamic
# loading, we only need miniperl and Cwd.$dlext. If we have static
# loading, we need to build perl first.
-case "$usedl" in
-define)
+case "$usedl
$static_cwd
" in
+define
undef
)
util_deps='$(MINIPERL_EXE) $(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE'
x2p_deps='$(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) FORCE'
;;
util_deps='$(MINIPERL_EXE) $(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE'
x2p_deps='$(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) FORCE'
;;
+definedefine)
+ util_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
+ x2p_deps='$(PERL_EXE) $(CONFIGPM) $(dynamic_ext) FORCE'
+ ;;
*) util_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
x2p_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
;;
*) util_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
x2p_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
;;
@@
-572,6
+580,9
@@
translators: $x2p_deps
x2p/s2p: $x2p_deps
cd x2p; \$(LDLIBPTH) \$(MAKE) s2p
x2p/s2p: $x2p_deps
cd x2p; \$(LDLIBPTH) \$(MAKE) s2p
+x2p/find2perl: $x2p_deps
+ cd x2p; \$(LDLIBPTH) \$(MAKE) find2perl
+
utilities: $util_deps
@echo " "; echo " Making utilities"; cd utils; \$(LDLIBPTH) \$(MAKE) all
utilities: $util_deps
@echo " "; echo " Making utilities"; cd utils; \$(LDLIBPTH) \$(MAKE) all
@@
-1020,8
+1031,8
@@
pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc
pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
$(MINIPERL) $(Icwd) pod/perlmodlib.PL -q
pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
$(MINIPERL) $(Icwd) pod/perlmodlib.PL -q
-pod/perl51
31
0delta.pod: pod/perldelta.pod
- $(LNS) perldelta.pod pod/perl51
31
0delta.pod
+pod/perl51
5
0delta.pod: pod/perldelta.pod
+ $(LNS) perldelta.pod pod/perl51
5
0delta.pod
extra.pods: $(MINIPERL_EXE)
-@test ! -f extra.pods || rm -f `cat extra.pods`
extra.pods: $(MINIPERL_EXE)
-@test ! -f extra.pods || rm -f `cat extra.pods`
@@
-1259,7
+1270,8
@@
_cleaner1:
_cleaner2:
-rm -f core.*perl.*.? t/core.perl.*.? .?*.c
rm -f core *perl.core t/core t/*perl.core core.* t/core.*
_cleaner2:
-rm -f core.*perl.*.? t/core.perl.*.? .?*.c
rm -f core *perl.core t/core t/*perl.core core.* t/core.*
- rm -f t/misctmp* t/forktmp* t/tmp* t/c t/$(PERL_EXE) t/rantests
+ rm -f t/$(PERL_EXE) t/rantests
+ rm -rf t/tmp*
rm -f so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR)
rm -rf $(addedbyconf)
rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old
rm -f so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR)
rm -rf $(addedbyconf)
rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old
@@
-1370,7
+1382,9
@@
_test:
test_prep_pre: preplibrary utilities $(nonxs_ext)
test_prep_pre: preplibrary utilities $(nonxs_ext)
-test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p $(generated_pods)
+test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \
+ $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p x2p/find2perl \
+ $(generated_pods)
cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
@@
-1407,7
+1421,7
@@
test.torture torturetest: test_prep
minitest.utf16: minitest.prep
- cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \
minitest.utf16: minitest.prep
- cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \
- && $(RUN_PERL) TEST -
minitest -
utf16 base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty
+ && $(RUN_PERL) TEST -utf16 base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty
test.utf16 check.utf16: test_prep
TEST_ARGS=-utf16 $(RUN_TESTS) choose
test.utf16 check.utf16: test_prep
TEST_ARGS=-utf16 $(RUN_TESTS) choose
@@
-1466,7
+1480,7
@@
minitest.prep:
# is crashing.
minitest: $(MINIPERL_EXE) minitest.prep
- cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \
# is crashing.
minitest: $(MINIPERL_EXE) minitest.prep
- cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \
- && $(RUN_PERL) TEST
-minitest
base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t op/*.t uni/*.t </dev/tty
+ && $(RUN_PERL) TEST base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t op/*.t uni/*.t </dev/tty
# Test via harness
# Test via harness
@@
-1483,7
+1497,7
@@
test-reonly: test_prep_reonly
# Porting tests (well-formedness of pod, manifest, etc)
test_porting: test_prep
# Porting tests (well-formedness of pod, manifest, etc)
test_porting: test_prep
- cd t && $(RUN_PERL) harness porting/*.t
+ cd t && $(RUN_PERL) harness porting/*.t
../lib/diagnostics.t
# Handy way to run perlbug -ok without having to install and run the
# installed perlbug. We don't re-run the tests here - we trust the user.
# Handy way to run perlbug -ok without having to install and run the
# installed perlbug. We don't re-run the tests here - we trust the user.