Browse Source
Merge pull request #4956 from pprindeville/perl-update-5.26.1
perl: update to 5.26.1lilik-openwrt-22.03
Philip Prindeville
7 years ago
committed by
GitHub
GitHub
16 changed files with 405 additions and 36 deletions
Unified View
Diff Options
-
+3 -3lang/perl/Makefile
-
+1 -0lang/perl/files/arm.config
-
+1 -0lang/perl/files/armeb.config
-
+18 -0lang/perl/files/base.config
-
+3 -0lang/perl/files/i486.config
-
+1 -0lang/perl/files/mips.config
-
+2 -0lang/perl/files/mips64.config
-
+1 -0lang/perl/files/mipsel.config
-
+1 -0lang/perl/files/powerpc.config
-
+2 -2lang/perl/files/version.config
-
+3 -0lang/perl/files/x86_64.config
-
+0 -27lang/perl/patches/020-host-libc-dir-moved-debian+derivatives.patch
-
+3 -3lang/perl/patches/110-always_use_miniperl.patch
-
+285 -0lang/perl/patches/900-use-rm-force.patch
-
+80 -0lang/perl/patches/910-miniperl-needs-inc-dot.patch
-
+1 -1lang/perl/perlmod.mk
+ 3
- 3
lang/perl/Makefile
View File
+ 1
- 0
lang/perl/files/arm.config
View File
+ 1
- 0
lang/perl/files/armeb.config
View File
+ 18
- 0
lang/perl/files/base.config
View File
+ 3
- 0
lang/perl/files/i486.config
View File
+ 1
- 0
lang/perl/files/mips.config
View File
+ 2
- 0
lang/perl/files/mips64.config
View File
+ 1
- 0
lang/perl/files/mipsel.config
View File
+ 1
- 0
lang/perl/files/powerpc.config
View File
+ 2
- 2
lang/perl/files/version.config
View File
+ 3
- 0
lang/perl/files/x86_64.config
View File
+ 0
- 27
lang/perl/patches/020-host-libc-dir-moved-debian+derivatives.patch
View File
| @ -1,27 +0,0 @@ | |||||
| --- a/hints/linux.sh | |||||
| +++ b/hints/linux.sh | |||||
| @@ -221,6 +221,24 @@ case "$libc" in | |||||
| ;; | |||||
| esac | |||||
| +# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries | |||||
| +# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us | |||||
| +# where to look. We don't want gcc's own libraries, however, so we | |||||
| +# filter those out. | |||||
| +# This could be conditional on Unbuntu, but other distributions may | |||||
| +# follow suit, and this scheme seems to work even on rather old gcc's. | |||||
| +# This unconditionally uses gcc because even if the user is using another | |||||
| +# compiler, we still need to find the math library and friends, and I don't | |||||
| +# know how other compilers will cope with that situation. | |||||
| +# Still, as an escape hatch, allow Configure command line overrides to | |||||
| +# plibpth to bypass this check. | |||||
| +case "$plibpth" in | |||||
| +'') plibpth=`gcc -print-search-dirs | grep libraries | | |||||
| + cut -f2- -d= | tr ':' $trnl | grep -v 'gcc'` | |||||
| + plibpth="$plibpth" # Collapse all entries on one line | |||||
| + ;; | |||||
| +esac | |||||
| + | |||||
| # Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com> | |||||
| # for this test. | |||||
| cat >try.c <<'EOM' | |||||
+ 3
- 3
lang/perl/patches/110-always_use_miniperl.patch
View File
+ 285
- 0
lang/perl/patches/900-use-rm-force.patch
View File
| @ -0,0 +1,285 @@ | |||||
| --- a/Makefile.SH 2017-10-17 11:59:52.938763142 -0600 | |||||
| +++ b/Makefile.SH 2017-10-17 12:13:46.202555604 -0600 | |||||
| @@ -270,6 +270,7 @@ LNS = $lns | |||||
| # NOTE: some systems don't grok "cp -f". XXX Configure test needed? | |||||
| CPS = $cp | |||||
| RMS = rm -f | |||||
| +RMS_R = rm -rf | |||||
| ranlib = $ranlib | |||||
| # The following are mentioned only to make metaconfig include the | |||||
| @@ -731,7 +731,7 @@ bitcount.h: generate_uudmap$(HOST_EXE_EX | |||||
| ./generate_uudmap$(HOST_EXE_EXT) $(generated_headers) | |||||
| generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT) | |||||
| - -@rm generate_uudmap$(HOST_EXE_EXT) | |||||
| + @$(RMS) generate_uudmap$(HOST_EXE_EXT) | |||||
| $(LNS) $(HOST_GENERATE) generate_uudmap$(HOST_EXE_EXT) | |||||
| !NO!SUBS! | |||||
| @@ -871,26 +872,26 @@ mydtrace.h: $(DTRACE_H) | |||||
| define) | |||||
| $spitshell >>$Makefile <<'!NO!SUBS!' | |||||
| $(DTRACE_MINI_O): perldtrace.d $(miniperl_objs_nodt) | |||||
| - -rm -rf mpdtrace | |||||
| + $(RMS_R) mpdtrace | |||||
| mkdir mpdtrace | |||||
| cp $(miniperl_objs_nodt) mpdtrace/ | |||||
| $(DTRACE) -G -s perldtrace.d -o $(DTRACE_MINI_O) $(miniperl_dtrace_objs) | |||||
| $(DTRACE_PERLLIB_O): perldtrace.d $(perllib_objs_nodt) | |||||
| - -rm -rf libpdtrace | |||||
| + $(RMS_R) libpdtrace | |||||
| mkdir libpdtrace | |||||
| cp $(perllib_objs_nodt) libpdtrace/ | |||||
| $(DTRACE) -G -s perldtrace.d -o $(DTRACE_PERLLIB_O) $(perllib_dtrace_objs) | |||||
| $(DTRACE_MAIN_O): perldtrace.d perlmain$(OBJ_EXT) | |||||
| - -rm -rf maindtrace | |||||
| + $(RMS_R) maindtrace | |||||
| mkdir maindtrace | |||||
| cp perlmain$(OBJ_EXT) maindtrace/ | |||||
| $(DTRACE) -G -s perldtrace.d -o $(DTRACE_MAIN_O) $(perlmain_dtrace_objs) || \ | |||||
| ( $(ECHO) "No probes in perlmain$(OBJ_EXT), generating a dummy $(DTRACE_MAIN_O)" && \ | |||||
| $(ECHO) >dtrace_main.c && \ | |||||
| `$(CCCMD)` $(PLDLFLAGS) dtrace_main.c && \ | |||||
| - rm -f dtrace_main.c ) | |||||
| + $(RMS) dtrace_main.c ) | |||||
| !NO!SUBS! | |||||
| ;; | |||||
| @@ -901,13 +902,13 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD | |||||
| case "$useshrplib" in | |||||
| true) | |||||
| $spitshell >>$Makefile <<'!NO!SUBS!' | |||||
| - rm -f $@ | |||||
| + $(RMS) $@ | |||||
| $(LD) -o $@ $(SHRPLDFLAGS) $(perllib_objs) $(DYNALOADER) $(libs) | |||||
| !NO!SUBS! | |||||
| case "$osname" in | |||||
| aix) | |||||
| $spitshell >>$Makefile <<'!NO!SUBS!' | |||||
| - rm -f libperl$(OBJ_EXT) | |||||
| + $(RMS) libperl$(OBJ_EXT) | |||||
| mv $@ libperl$(OBJ_EXT) | |||||
| $(AR) qv $(LIBPERL) libperl$(OBJ_EXT) | |||||
| !NO!SUBS! | |||||
| @@ -916,7 +917,7 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD | |||||
| ;; | |||||
| *) | |||||
| $spitshell >>$Makefile <<'!NO!SUBS!' | |||||
| - rm -f $(LIBPERL) | |||||
| + $(RMS) $(LIBPERL) | |||||
| $(AR) rc $(LIBPERL) $(perllib_objs) $(DYNALOADER) | |||||
| @$(ranlib) $(LIBPERL) | |||||
| !NO!SUBS! | |||||
| @@ -949,7 +950,7 @@ $(MINIPERL_EXE): lib/buildcustomize.pl | |||||
| amigaos*) | |||||
| $spitshell >>$Makefile <<'!NO!SUBS!' | |||||
| lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl | |||||
| - -@rm -f miniperl.xok | |||||
| + @$(RMS) miniperl.xok | |||||
| $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ | |||||
| $(miniperl_objs) $(libs) | |||||
| # $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | |||||
| @@ -987,7 +988,7 @@ NAMESPACEFLAGS = -force_flat_namespace | |||||
| esac | |||||
| $spitshell >>$Makefile <<'!NO!SUBS!' | |||||
| lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl | |||||
| - -@rm -f miniperl.xok | |||||
| + @$(RMS) miniperl.xok | |||||
| $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ | |||||
| $(miniperl_objs) $(libs) | |||||
| $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | |||||
| @@ -998,8 +999,8 @@ lib/buildcustomize.pl: $& $(miniperl_obj | |||||
| if test "X$hostperl" != X; then | |||||
| $spitshell >>$Makefile <<!GROK!THIS! | |||||
| lib/buildcustomize.pl: \$& \$(miniperl_dep) write_buildcustomize.pl | |||||
| - -@rm -f miniperl.xok | |||||
| - -@rm \$(MINIPERL_EXE) | |||||
| + @\$(RMS) miniperl.xok | |||||
| + @\$(RMS) \$(MINIPERL_EXE) | |||||
| \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE) | |||||
| \$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | |||||
| \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname" | |||||
| @@ -1007,7 +1008,7 @@ lib/buildcustomize.pl: \$& \$(miniperl_d | |||||
| else | |||||
| $spitshell >>$Makefile <<'!NO!SUBS!' | |||||
| lib/buildcustomize.pl: $& $(miniperl_dep) write_buildcustomize.pl | |||||
| - -@rm -f miniperl.xok | |||||
| + @$(RMS) miniperl.xok | |||||
| $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ | |||||
| $(miniperl_objs) $(libs) | |||||
| $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | |||||
| @@ -1020,7 +1021,7 @@ lib/buildcustomize.pl: $& $(miniperl_dep | |||||
| $spitshell >>$Makefile <<'!NO!SUBS!' | |||||
| $(PERL_EXE): $& $(perlmain_dep) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) write_buildcustomize.pl | |||||
| - -@rm -f miniperl.xok | |||||
| + @$(RMS) miniperl.xok | |||||
| !NO!SUBS! | |||||
| case $osname in | |||||
| @@ -1114,8 +1115,8 @@ pod/perl5261delta.pod: pod/perldelta.pod | |||||
| $(LNS) perldelta.pod pod/perl5261delta.pod | |||||
| extra.pods: $(MINIPERL_EXE) | |||||
| - -@test ! -f extra.pods || rm -f `cat extra.pods` | |||||
| - -@rm -f extra.pods | |||||
| + -@test ! -f extra.pods || $(RMS) `cat extra.pods` | |||||
| + @$(RMS) extra.pods | |||||
| -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ | |||||
| nx=`echo $$x | sed -e "s/README\.//"`; \ | |||||
| $(LNS) ../$$x "pod/perl"$$nx".pod" ; \ | |||||
| @@ -1332,11 +1333,11 @@ realclean: _realcleaner _mopup | |||||
| @echo "Note that '$(MAKE) realclean' does not delete config.sh or Policy.sh" | |||||
| _clobber: | |||||
| - -@rm -f Cross/run-* Cross/to-* Cross/from-* Cross/mkdir | |||||
| - -rm -rf host | |||||
| - rm -f t/test_state | |||||
| - rm -f config.sh cppstdin Policy.sh extras.lst | |||||
| - rm -f $(MANIFEST_SRT) | |||||
| + @$(RMS) Cross/run-* Cross/to-* Cross/from-* Cross/mkdir | |||||
| + $(RMS_R) host | |||||
| + $(RMS) t/test_state | |||||
| + $(RMS) config.sh cppstdin Policy.sh extras.lst | |||||
| + $(RMS) $(MANIFEST_SRT) | |||||
| clobber: _realcleaner _mopup _clobber | |||||
| @@ -1344,23 +1345,23 @@ distclean: clobber | |||||
| # Like distclean but also removes emacs backups and *.orig. | |||||
| veryclean: _verycleaner _mopup _clobber | |||||
| - -@rm -f Obsolete Wanted | |||||
| + $(RMS) Obsolete Wanted | |||||
| # Do not 'make _mopup' directly. | |||||
| _mopup: | |||||
| - rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c opmini.c perlmini.c generate_uudmap$(EXE_EXT) $(generated_headers) | |||||
| + $(RMS) *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c opmini.c perlmini.c generate_uudmap$(EXE_EXT) $(generated_headers) | |||||
| -rmdir .depending | |||||
| - -@test -f extra.pods && rm -f `cat extra.pods` | |||||
| - -@test -f vms/README_vms.pod && rm -f vms/README_vms.pod | |||||
| - -rm -f perl.exp ext.libs $(generated_pods) uni.data opmini.o perlmini.o pod/roffitall | |||||
| - -rm -f perl.export perl.dll perl.libexp perl.map perl.def | |||||
| - -rm -f *perl.xok | |||||
| - -rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump | |||||
| - -rm -f $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl | |||||
| - -rm -f config.arch config.over $(DTRACE_H) | |||||
| + -@test -f extra.pods && $(RMS) `cat extra.pods` | |||||
| + -@test -f vms/README_vms.pod && $(RMS) vms/README_vms.pod | |||||
| + $(RMS) perl.exp ext.libs $(generated_pods) uni.data opmini.o perlmini.o pod/roffitall | |||||
| + $(RMS) perl.export perl.dll perl.libexp perl.map perl.def | |||||
| + $(RMS) *perl.xok | |||||
| + $(RMS) cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump | |||||
| + $(RMS) $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl | |||||
| + $(RMS) config.arch config.over $(DTRACE_H) | |||||
| _cleaner1: | |||||
| - -cd os2; rm -f Makefile | |||||
| + -cd os2; $(RMS) Makefile | |||||
| -cd pod; $(LDLIBPTH) $(MAKE) $(CLEAN) | |||||
| -cd utils; $(LDLIBPTH) $(MAKE) $(CLEAN) | |||||
| -@if test -f $(MINIPERL_EXE) ; then \ | |||||
| @@ -1370,31 +1371,31 @@ _cleaner1: | |||||
| else \ | |||||
| sh $(CLEAN).sh ; \ | |||||
| fi | |||||
| - rm -f realclean.sh veryclean.sh | |||||
| - -rm -f `grep -v ^# mkppport.lst | grep . | sed -e 's/$$/\/ppport.h/'` | |||||
| + $(RMS) realclean.sh veryclean.sh | |||||
| + $(RMS) `grep -v ^# mkppport.lst | grep . | sed -e 's/$$/\/ppport.h/'` | |||||
| # Dear POSIX, thanks for making the default to xargs to be | |||||
| # run once if nothhing is passed in. It is such a great help. | |||||
| # Some systems do not support "?", so keep these files separate. | |||||
| _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/$(PERL_EXE) t/rantests | |||||
| - rm -rf t/tmp* | |||||
| - rm -rf $(addedbyconf) | |||||
| - rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old utils/Makefile | |||||
| - rm -f $(private) | |||||
| - rm -rf $(unidatafiles) $(unidatadirs) | |||||
| - rm -rf lib/auto | |||||
| - rm -f lib/.exists lib/*/.exists lib/*/*/.exists | |||||
| - rm -f h2ph.man | |||||
| - rm -rf .config | |||||
| - rm -f preload | |||||
| - rm -f pod2htmd.tmp | |||||
| - rm -rf pod/perlfunc pod/perlipc | |||||
| + $(RMS) core.*perl.*.? t/core.perl.*.? .?*.c | |||||
| + $(RMS) core *perl.core t/core t/*perl.core core.* t/core.* | |||||
| + $(RMS) t/$(PERL_EXE) t/rantests | |||||
| + $(RMS_R) t/tmp* | |||||
| + $(RMS_R) $(addedbyconf) | |||||
| + $(RMS) $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old utils/Makefile | |||||
| + $(RMS) $(private) | |||||
| + $(RMS_R) $(unidatafiles) $(unidatadirs) | |||||
| + $(RMS_R) lib/auto | |||||
| + $(RMS) lib/.exists lib/*/.exists lib/*/*/.exists | |||||
| + $(RMS) h2ph.man | |||||
| + $(RMS_R) .config | |||||
| + $(RMS) preload | |||||
| + $(RMS) pod2htmd.tmp | |||||
| + $(RMS_R) pod/perlfunc pod/perlipc | |||||
| -rmdir ext/B/lib | |||||
| - rm -f so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR) | |||||
| + $(RMS) so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR) | |||||
| -rmdir lib/version lib/threads lib/inc/ExtUtils lib/inc lib/encoding | |||||
| -rmdir lib/autodie/exception lib/autodie/Scope lib/autodie lib/XS | |||||
| -rmdir lib/Win32API lib/VMS lib/Unicode/Collate/Locale | |||||
| @@ -1443,11 +1444,11 @@ _realcleaner: | |||||
| _verycleaner: | |||||
| @$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=veryclean | |||||
| @$(LDLIBPTH) $(MAKE) _cleaner2 | |||||
| - -rm -f *~ *.orig */*~ */*.orig */*/*~ */*/*.orig | |||||
| + $(RMS) *~ *.orig */*~ */*.orig */*/*~ */*/*.orig | |||||
| .PHONY: lint | |||||
| lint: $(c) | |||||
| - rm -f *.ln | |||||
| + $(RMS) *.ln | |||||
| lint $(lintflags) -DPERL_CORE -D_REENTRANT -DDEBUGGING -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(c) | |||||
| cscopeflags = -Rb # Recursive, build-only. | |||||
| @@ -1505,7 +1506,7 @@ case "$targethost" in | |||||
| '') $spitshell >>$Makefile <<'!NO!SUBS!' | |||||
| test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \ | |||||
| $(dynamic_ext) $(TEST_PERL_DLL) runtests $(generated_pods) | |||||
| - cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) | |||||
| + cd t && ($(RMS) $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) | |||||
| !NO!SUBS! | |||||
| ;; | |||||
| @@ -1555,7 +1556,7 @@ test_prep test-prep: test_prep_pre \$(MI | |||||
| $to config.sh | |||||
| # --- For lib/diagnostics.t with -Duseshrplib | |||||
| $to \$(PERL_EXE) | |||||
| - cd t && (rm -f \$(PERL_EXE); \$(LNS) ../\$(PERL_EXE) \$(PERL_EXE)) && cd .. | |||||
| + cd t && (\$(RMS) \$(PERL_EXE); \$(LNS) ../\$(PERL_EXE) \$(PERL_EXE)) && cd .. | |||||
| $to t/\$(PERL_EXE) | |||||
| !GROK!THIS! | |||||
| @@ -1565,7 +1566,7 @@ esac | |||||
| $spitshell >>$Makefile <<'!NO!SUBS!' | |||||
| test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL) | |||||
| $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic | |||||
| - cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) | |||||
| + cd t && ($(RMS) $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) | |||||
| !NO!SUBS! | |||||
| case "$targethost" in | |||||
| @@ -1620,7 +1621,7 @@ minitest_prep: | |||||
| @echo "You may see some irrelevant test failures if you have been unable" | |||||
| @echo "to build lib/Config.pm, or the Unicode data files." | |||||
| @echo " " | |||||
| - - cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) | |||||
| + - cd t && ($(RMS) $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) | |||||
| MINITEST_TESTS = base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t opbasic/*.t op/*.t uni/*.t perf/*.t | |||||
+ 80
- 0
lang/perl/patches/910-miniperl-needs-inc-dot.patch
View File
| @ -0,0 +1,80 @@ | |||||
| --- a/Makefile.SH 2017-10-15 18:57:08.436234652 -0600 | |||||
| +++ b/Makefile.SH 2017-10-15 19:02:47.587658819 -0600 | |||||
| @@ -327,7 +327,7 @@ PATH_SEP = $p_ | |||||
| # Macros to invoke a copy of miniperl during the build. Targets which | |||||
| # are built using these macros should depend on \$(MINIPERL_EXE) | |||||
| MINIPERL_EXE = miniperl\$(EXE_EXT) | |||||
| -MINIPERL = \$(LDLIBPTH) ./miniperl\$(EXE_EXT) -Ilib | |||||
| +MINIPERL = \$(LDLIBPTH) ./miniperl\$(EXE_EXT) -Ilib -I. | |||||
| # Macros to invoke sort the MANIFEST during build | |||||
| MANIFEST_SRT = MANIFEST.srt | |||||
| @@ -990,7 +990,7 @@ NAMESPACEFLAGS = -force_flat_namespace | |||||
| @$(RMS) miniperl.xok | |||||
| $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ | |||||
| $(miniperl_objs) $(libs) | |||||
| - $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | |||||
| + $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -I. -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | |||||
| $(MINIPERL) -f write_buildcustomize.pl | |||||
| !NO!SUBS! | |||||
| ;; | |||||
| @@ -1001,16 +1001,16 @@ lib/buildcustomize.pl: $& $(miniperl_obj | |||||
| @\$(RMS) miniperl.xok | |||||
| @\$(RMS) \$(MINIPERL_EXE) | |||||
| \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE) | |||||
| - \$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | |||||
| + \$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -I. -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | |||||
| \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname" | |||||
| !GROK!THIS! | |||||
| else | |||||
| $spitshell >>$Makefile <<'!NO!SUBS!' | |||||
| lib/buildcustomize.pl: $& $(miniperl_dep) write_buildcustomize.pl | |||||
| @$(RMS) miniperl.xok | |||||
| $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ | |||||
| $(miniperl_objs) $(libs) | |||||
| - $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | |||||
| + $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -I. -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' | |||||
| $(MINIPERL) -f write_buildcustomize.pl | |||||
| !NO!SUBS! | |||||
| fi | |||||
| --- a/cpan/Devel-PPPort/PPPort_pm.PL 2017-07-18 16:59:59.000000000 -0600 | |||||
| +++ b/cpan/Devel-PPPort/PPPort_pm.PL 2017-10-15 19:19:27.341543182 -0600 | |||||
| @@ -15,6 +15,7 @@ | |||||
| use strict; | |||||
| $^W = 1; | |||||
| +push(@INC, '.'); | |||||
| require "parts/ppptools.pl"; | |||||
| my $INCLUDE = 'parts/inc'; | |||||
| --- a/cpan/Devel-PPPort/ppport_h.PL 2017-07-18 16:59:59.000000000 -0600 | |||||
| +++ b/cpan/Devel-PPPort/ppport_h.PL 2017-10-15 19:27:16.594178623 -0600 | |||||
| @@ -14,6 +14,7 @@ | |||||
| ################################################################################ | |||||
| package Devel::PPPort; | |||||
| +push(@INC, '.'); | |||||
| require "PPPort.pm"; | |||||
| rename 'ppport.h', 'ppport.old' if -f 'ppport.h'; | |||||
| unlink "ppport.old" if WriteFile("ppport.h") && -f 'ppport.h'; | |||||
| --- a/cpan/Devel-PPPort/PPPort_xs.PL 2017-07-18 16:59:59.000000000 -0600 | |||||
| +++ b/cpan/Devel-PPPort/PPPort_xs.PL 2017-10-15 19:38:09.296679968 -0600 | |||||
| @@ -15,6 +15,7 @@ | |||||
| use strict; | |||||
| $^W = 1; | |||||
| +push(@INC, '.'); | |||||
| require "parts/ppptools.pl"; | |||||
| my %SECTION = ( | |||||
| --- a/cpan/Unicode-Collate/Makefile.PL 2017-07-18 16:49:51.000000000 -0600 | |||||
| +++ b/cpan/Unicode-Collate/Makefile.PL 2017-10-15 20:19:31.890439791 -0600 | |||||
| @@ -6,7 +6,7 @@ my $clean = {}; | |||||
| if (-f "Collate.xs") { | |||||
| print "Making header files for XS...\n"; | |||||
| - do 'mkheader' or die $@ || "mkheader: $!"; | |||||
| + do './mkheader' or die $@ || "mkheader: $!"; | |||||
| $clean = { FILES => 'ucatbl.h' }; | |||||
| } | |||||