diff options
| author | Steve Hay <steve.m.hay@googlemail.com> | 2015-02-18 08:26:36 +0000 |
|---|---|---|
| committer | Steve Hay <steve.m.hay@googlemail.com> | 2015-02-18 08:26:36 +0000 |
| commit | c67aee7a0ec313b3a0ea285a77b3cda5496f4e17 (patch) | |
| tree | 485e6c533cc20e9a89de5cfe839ca1b7530e5d56 /Cross | |
| parent | 7d78c51a505cbafa404de787e640a4ad76839a16 (diff) | |
| download | perl-c67aee7a0ec313b3a0ea285a77b3cda5496f4e17.tar.gz | |
Remove some remnants of x2p, which was removed by commit e5a8a0fbd7
References to PERL_FOR_X2P probably have to stay in case any third-party
code is #defining it. Likewise, NO_PERL_TYPEDEFS in vms/vmsish.h has to
stay because it actually is used by App::a2p.
Cross/Makefile.SH.patch still needs regenerating since it contains
references to x2p in the top-level Makefile.SH which were removed by
e5a8a0fbd7.
A few other references to x2p/a2p/find2p/s2p still remain, which I am less
sure about removing, plus some others in documentation which should stay
anyway.
Diffstat (limited to 'Cross')
| -rw-r--r-- | Cross/Makefile-cross-SH | 45 |
1 files changed, 2 insertions, 43 deletions
diff --git a/Cross/Makefile-cross-SH b/Cross/Makefile-cross-SH index eb673ce6fe..3260be44bc 100644 --- a/Cross/Makefile-cross-SH +++ b/Cross/Makefile-cross-SH @@ -14,7 +14,7 @@ Makefile=Makefile-cross-$CROSS_NAME # are removed/replaced in patches on blead, but are still needed in the # 5.8.x, 5.6.x and 5.005.x maintenance tracks. # metaconfig -m will scan all .SH files on this level (not deeper), and -# not in x2p and other subfolders. This file is as good as any .SH +# not in other subfolders. This file is as good as any .SH # patch references # #22227 $baserev # #22302 $yacc $byacc @@ -966,7 +966,6 @@ _mopup: _tidy: -cd pod; $(LDLIBPTH) $(MAKE) clean -cd utils; $(LDLIBPTH) $(MAKE) clean - -cd x2p; $(LDLIBPTH) $(MAKE) clean -@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \ $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib make_ext.pl --target=clean $$x MAKE=$(MAKE) ; \ done @@ -975,7 +974,6 @@ _cleaner1: -cd os2; rm -f Makefile -cd pod; $(LDLIBPTH) $(MAKE) $(CLEAN) -cd utils; $(LDLIBPTH) $(MAKE) $(CLEAN) - -cd x2p; $(LDLIBPTH) $(MAKE) $(CLEAN) -@if test -f miniperl$(EXE_EXT) ; then \ for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \ $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib make_ext.pl --target=$(CLEAN) $$x MAKE=$(MAKE) ; \ @@ -1055,7 +1053,6 @@ xconfig.h: config_h.SH Cross/config-$(CROSS_NAME).sh depend: makedepend sh ./makedepend MAKE=$(MAKE) - test -s perlmain.c && touch perlmain.c - cd x2p; $(MAKE) depend # Cannot postpone this until $firstmakefile is ready ;-) makedepend: makedepend.SH config.sh @@ -1082,7 +1079,7 @@ _test_prep: test_prep_pre: preplibrary utilities $(nonxs_ext) test_prep: test_prep_pre miniperl$(EXE_EXT) $(unidatafiles) perl$(EXE_EXT) \ - $(dynamic_ext) $(TEST_PERL_DLL) x2p/s2p x2p/find2perl + $(dynamic_ext) $(TEST_PERL_DLL) PERL=./perl $(MAKE) _test_prep _test_tty: @@ -1288,44 +1285,6 @@ define) echo "This is an EBCDIC system, checking if any parser files need regenerating." >&2 case "$osname" in os390|posix-bc) - if cd x2p - then - rm -f y.tab.c y.tab.h - case "$osname" in - posix-bc) - # we are using two different yaccs in BS2000 Posix! - byacc a2p.y >/dev/null 2>&1 - ;; - *) # e.g. os390 - yacc a2p.y >/dev/null 2>&1 - ;; - esac - if cmp -s y.tab.c a2p.c - then - rm -f y.tab.c - else - echo "a2p.y -> a2p.c" >&2 - mv -f y.tab.c a2p.c - chmod u+w a2p.c - sed -e 's/fprintf *( *stderr *,/PerlIO_printf(Perl_debug_log,/g' \ - -e 's|^static void __YY_YACC_MAIN.*BS2000.*|/*static main deleted*/|' \ - -e 's/y\.tab/a2p/g' a2p.c >a2p.tmp && mv a2p.tmp a2p.c - xxx="$xxx a2p.c" - fi - # In case somebody yacc -d:ed the a2p.y. - if test -f y.tab.h - then - if cmp -s y.tab.h a2p.h - then - rm -f y.tab.h - else - echo "a2p.h -> a2p.h" >&2 - mv -f y.tab.h a2p.h - xxx="$xxx a2p.h" - fi - fi - cd .. - fi ;; *) echo "'$osname' is an EBCDIC system I don't know that well." >&4 |