patch-Makefile_pre_in 4.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118
  1. diff -Nur Python-3.2.2.orig/Makefile.pre.in Python-3.2.2/Makefile.pre.in
  2. --- Python-3.2.2.orig/Makefile.pre.in 2011-09-03 18:16:45.000000000 +0200
  3. +++ Python-3.2.2/Makefile.pre.in 2011-09-05 11:58:25.000000000 +0200
  4. @@ -57,7 +57,7 @@
  5. # Shared libraries must be installed with executable mode on some systems;
  6. # rather than figuring out exactly which, we always give them executable mode.
  7. # Also, making them read-only seems to be a good idea...
  8. -INSTALL_SHARED= ${INSTALL} -m 555
  9. +INSTALL_SHARED= ${INSTALL} -m 755
  10. MAKESETUP= $(srcdir)/Modules/makesetup
  11. @@ -191,6 +191,7 @@
  12. PYTHON= python$(EXE)
  13. BUILDPYTHON= python$(BUILDEXE)
  14. +HOSTPYTHON?= $(BUILDPYTHON)
  15. # The task to run while instrument when building the profile-opt target
  16. PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
  17. @@ -233,6 +234,7 @@
  18. ##########################################################################
  19. # Parser
  20. PGEN= Parser/pgen$(EXE)
  21. +HOSTPGEN?= $(PGEN)$(EXE)
  22. POBJS= \
  23. Parser/acceler.o \
  24. @@ -413,7 +415,7 @@
  25. $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
  26. run_profile_task:
  27. - ./$(BUILDPYTHON) $(PROFILE_TASK)
  28. + $(HOSTPYTHON) $(PROFILE_TASK)
  29. build_all_use_profile:
  30. $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use"
  31. @@ -429,14 +431,14 @@
  32. $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  33. platform: $(BUILDPYTHON)
  34. - $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
  35. + $(RUNSHARED) $(HOSTPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
  36. # Build the shared modules
  37. sharedmods: $(BUILDPYTHON)
  38. @case $$MAKEFLAGS in \
  39. - *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
  40. - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
  41. + *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
  42. + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
  43. esac
  44. # Build static library
  45. @@ -587,7 +589,7 @@
  46. $(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp
  47. Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT)
  48. -@$(INSTALL) -d Include
  49. - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
  50. + -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
  51. -touch Parser/pgen.stamp
  52. $(PGEN): $(PGENOBJS)
  53. @@ -758,7 +760,7 @@
  54. TESTOPTS= -l $(EXTRATESTOPTS)
  55. TESTPROG= $(srcdir)/Lib/test/regrtest.py
  56. -TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -Wd -E -bb $(TESTPYTHONOPTS)
  57. +TESTPYTHON= $(RUNSHARED) $(HOSTPYTHON) -Wd -E -bb $(TESTPYTHONOPTS)
  58. test: all platform
  59. -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
  60. -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
  61. @@ -1102,7 +1104,7 @@
  62. # Install the dynamically loadable modules
  63. # This goes into $(exec_prefix)
  64. sharedinstall: sharedmods
  65. - $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
  66. + $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
  67. --prefix=$(prefix) \
  68. --install-scripts=$(BINDIR) \
  69. --install-platlib=$(DESTSHARED) \
  70. @@ -1140,7 +1142,7 @@
  71. fi; \
  72. done
  73. $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers
  74. - sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
  75. + sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
  76. $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
  77. $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
  78. $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
  79. @@ -1174,7 +1176,7 @@
  80. # This installs a few of the useful scripts in Tools/scripts
  81. scriptsinstall:
  82. SRCDIR=$(srcdir) $(RUNSHARED) \
  83. - ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
  84. + $(HOSTPYTHON) $(srcdir)/Tools/scripts/setup.py install \
  85. --prefix=$(prefix) \
  86. --install-scripts=$(BINDIR) \
  87. --root=$(DESTDIR)/
  88. @@ -1196,7 +1198,7 @@
  89. # Run reindent on the library
  90. reindent:
  91. - ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
  92. + $(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
  93. # Rerun configure with the same options as it was run last time,
  94. # provided the config.status script exists
  95. @@ -1317,7 +1319,7 @@
  96. # Perform some verification checks on any modified files.
  97. patchcheck:
  98. - $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
  99. + $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
  100. # Dependencies