You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

80 lines
3.5 KiB

  1. --- a/Makefile.SH 2017-10-15 18:57:08.436234652 -0600
  2. +++ b/Makefile.SH 2017-10-15 19:02:47.587658819 -0600
  3. @@ -328,7 +328,7 @@ PATH_SEP = $p_
  4. # Macros to invoke a copy of miniperl during the build. Targets which
  5. # are built using these macros should depend on \$(MINIPERL_EXE)
  6. MINIPERL_EXE = miniperl\$(EXE_EXT)
  7. -MINIPERL = \$(LDLIBPTH) ./miniperl\$(EXE_EXT) -Ilib
  8. +MINIPERL = \$(LDLIBPTH) ./miniperl\$(EXE_EXT) -Ilib -I.
  9. # Macros to invoke sort the MANIFEST during build
  10. MANIFEST_SRT = MANIFEST.srt
  11. @@ -991,7 +991,7 @@ NAMESPACEFLAGS = -force_flat_namespace
  12. @$(RMS) miniperl.xok
  13. $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
  14. $(miniperl_objs) $(libs)
  15. - $(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'
  16. + $(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'
  17. $(MINIPERL) -f write_buildcustomize.pl
  18. !NO!SUBS!
  19. ;;
  20. @@ -1002,16 +1002,16 @@ lib/buildcustomize.pl: $& $(miniperl_obj
  21. @\$(RMS) miniperl.xok
  22. @\$(RMS) \$(MINIPERL_EXE)
  23. \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE)
  24. - \$(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'
  25. + \$(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'
  26. \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname"
  27. !GROK!THIS!
  28. else
  29. $spitshell >>$Makefile <<'!NO!SUBS!'
  30. lib/buildcustomize.pl: $& $(miniperl_dep) write_buildcustomize.pl
  31. @$(RMS) miniperl.xok
  32. $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
  33. $(miniperl_objs) $(libs)
  34. - $(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'
  35. + $(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'
  36. $(MINIPERL) -f write_buildcustomize.pl
  37. !NO!SUBS!
  38. fi
  39. --- a/cpan/Devel-PPPort/PPPort_pm.PL 2017-07-18 16:59:59.000000000 -0600
  40. +++ b/cpan/Devel-PPPort/PPPort_pm.PL 2017-10-15 19:19:27.341543182 -0600
  41. @@ -15,6 +15,7 @@
  42. use strict;
  43. $^W = 1;
  44. +push(@INC, '.');
  45. require "parts/ppptools.pl";
  46. my $INCLUDE = 'parts/inc';
  47. --- a/cpan/Devel-PPPort/ppport_h.PL 2017-07-18 16:59:59.000000000 -0600
  48. +++ b/cpan/Devel-PPPort/ppport_h.PL 2017-10-15 19:27:16.594178623 -0600
  49. @@ -14,6 +14,7 @@
  50. ################################################################################
  51. package Devel::PPPort;
  52. +push(@INC, '.');
  53. require "PPPort.pm";
  54. rename 'ppport.h', 'ppport.old' if -f 'ppport.h';
  55. unlink "ppport.old" if WriteFile("ppport.h") && -f 'ppport.h';
  56. --- a/cpan/Devel-PPPort/PPPort_xs.PL 2017-07-18 16:59:59.000000000 -0600
  57. +++ b/cpan/Devel-PPPort/PPPort_xs.PL 2017-10-15 19:38:09.296679968 -0600
  58. @@ -15,6 +15,7 @@
  59. use strict;
  60. $^W = 1;
  61. +push(@INC, '.');
  62. require "parts/ppptools.pl";
  63. my %SECTION = (
  64. --- a/cpan/Unicode-Collate/Makefile.PL 2017-07-18 16:49:51.000000000 -0600
  65. +++ b/cpan/Unicode-Collate/Makefile.PL 2017-10-15 20:19:31.890439791 -0600
  66. @@ -6,7 +6,7 @@ my $clean = {};
  67. if (-f "Collate.xs") {
  68. print "Making header files for XS...\n";
  69. - do 'mkheader' or die $@ || "mkheader: $!";
  70. + do './mkheader' or die $@ || "mkheader: $!";
  71. $clean = { FILES => 'ucatbl.h' };
  72. }