patch-Makefile_SH 1.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. --- perl-5.18.1.orig/Makefile.SH 2013-08-12 04:44:47.000000000 +0200
  2. +++ perl-5.18.1/Makefile.SH 2014-02-18 16:20:59.000000000 +0100
  3. @@ -319,7 +319,7 @@ MINIPERL = \$(LDLIBPTH) \$(RUN) ./minipe
  4. # Macros to invoke a copy of our fully operational perl during the build.
  5. PERL_EXE = perl\$(EXE_EXT)
  6. -RUN_PERL = \$(LDLIBPTH) \$(RUN) ./perl\$(EXE_EXT)
  7. +RUN_PERL = \$(LDLIBPTH) \$(RUN) @@STAGING_HOST_DIR@@/perl-host\$(EXE_EXT)
  8. # Macros to run our tests
  9. RUN_TESTS = \$(LDLIBPTH) ./runtests
  10. @@ -665,9 +665,10 @@ bitcount.h: generate_uudmap$(HOST_EXE_EX
  11. $(RUN) ./generate_uudmap$(HOST_EXE_EXT) $(generated_headers)
  12. generate_uudmap$(OBJ_EXT): mg_raw.h
  13. + $(CC_FOR_BUILD) -o generate_uudmap$(OBJ_EXT) -c generate_uudmap.c
  14. generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT)
  15. - $(CC) -o generate_uudmap$(EXE_EXT) $(LDFLAGS) generate_uudmap$(OBJ_EXT) $(libs)
  16. + $(CC_FOR_BUILD) -o generate_uudmap$(EXE_EXT) generate_uudmap$(OBJ_EXT)
  17. miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h
  18. $(CCCMD) $(PLDLFLAGS) $*.c
  19. @@ -881,7 +882,6 @@ $(MINIPERL_EXE): $& $(mini_obj)
  20. -@rm -f miniperl.xok
  21. $(LDLIBPTH) $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
  22. $(mini_obj) $(libs)
  23. - $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
  24. !NO!SUBS!
  25. ;;
  26. esac
  27. @@ -1058,7 +1058,7 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li
  28. # But also this ensures that all extensions are built before we try to scan
  29. # them, which picks up Devel::PPPort's documentation.
  30. pod/perltoc.pod: $(perltoc_pod_prereqs) $(PERL_EXE) $(ext) pod/buildtoc
  31. - $(RUN_PERL) -f -Ilib pod/buildtoc -q
  32. + $(RUN_PERL) -f @@LIB@@ pod/buildtoc -q
  33. pod/perlapi.pod: pod/perlintern.pod