patch-Makefile_pre_in 4.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108
  1. --- Python-3.1.1.orig/Makefile.pre.in 2009-06-12 00:54:11.000000000 +0200
  2. +++ Python-3.1.1/Makefile.pre.in 2009-09-16 21:36:12.000000000 +0200
  3. @@ -177,6 +177,7 @@ LIBOBJS= @LIBOBJS@
  4. PYTHON= python$(EXE)
  5. BUILDPYTHON= python$(BUILDEXE)
  6. +HOSTPYTHON?= $(BUILDPYTHON)
  7. # The task to run while instrument when building the profile-opt target
  8. PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
  9. @@ -217,6 +218,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
  10. ##########################################################################
  11. # Parser
  12. PGEN= Parser/pgen$(EXE)
  13. +HOSTPGEN?= $(PGEN)$(EXE)
  14. POBJS= \
  15. Parser/acceler.o \
  16. @@ -393,7 +395,7 @@ build_all_generate_profile:
  17. $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
  18. run_profile_task:
  19. - ./$(BUILDPYTHON) $(PROFILE_TASK)
  20. + $(HOSTPYTHON) $(PROFILE_TASK)
  21. build_all_use_profile:
  22. $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use"
  23. @@ -411,14 +413,14 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA
  24. $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  25. platform: $(BUILDPYTHON)
  26. - $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
  27. + $(RUNSHARED) $(HOSTPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
  28. # Build the shared modules
  29. sharedmods: $(BUILDPYTHON)
  30. @case $$MAKEFLAGS in \
  31. - *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
  32. - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
  33. + *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
  34. + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
  35. esac
  36. # Build static library
  37. @@ -542,7 +544,7 @@ $(IO_OBJS): $(IO_H)
  38. $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
  39. -@$(INSTALL) -d Include
  40. - -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
  41. + -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
  42. $(PGEN): $(PGENOBJS)
  43. $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
  44. @@ -705,7 +707,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho
  45. TESTOPTS= -l $(EXTRATESTOPTS)
  46. TESTPROG= $(srcdir)/Lib/test/regrtest.py
  47. -TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -E -bb
  48. +TESTPYTHON= $(RUNSHARED) $(HOSTPYTHON) -E -bb
  49. test: all platform
  50. -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
  51. -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
  52. @@ -1018,7 +1020,7 @@ libainstall: all
  53. # Install the dynamically loadable modules
  54. # This goes into $(exec_prefix)
  55. sharedinstall:
  56. - $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
  57. + $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
  58. --prefix=$(prefix) \
  59. --install-scripts=$(BINDIR) \
  60. --install-platlib=$(DESTSHARED) \
  61. @@ -1056,7 +1058,7 @@ frameworkinstallstructure: $(LDLIBRARY)
  62. fi; \
  63. done
  64. $(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers
  65. - sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
  66. + sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
  67. $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
  68. $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
  69. $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
  70. @@ -1098,7 +1100,7 @@ frameworkinstallextras:
  71. # This installs a few of the useful scripts in Tools/scripts
  72. scriptsinstall:
  73. SRCDIR=$(srcdir) $(RUNSHARED) \
  74. - ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
  75. + $(HOSTPYTHON) $(srcdir)/Tools/scripts/setup.py install \
  76. --prefix=$(prefix) \
  77. --install-scripts=$(BINDIR) \
  78. --root=/$(DESTDIR)
  79. @@ -1120,7 +1122,7 @@ config.status: $(srcdir)/configure
  80. # Run reindent on the library
  81. reindent:
  82. - ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
  83. + $(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
  84. # Rerun configure with the same options as it was run last time,
  85. # provided the config.status script exists
  86. @@ -1234,7 +1236,7 @@ funny:
  87. # Perform some verification checks on any modified files.
  88. patchcheck:
  89. - $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
  90. + $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
  91. # Dependencies