patch-Makefile_pre_in 2.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970
  1. --- Python-3.3.2.orig/Makefile.pre.in 2013-05-15 18:32:57.000000000 +0200
  2. +++ Python-3.3.2/Makefile.pre.in 2013-10-29 07:56:46.000000000 +0100
  3. @@ -70,9 +70,9 @@ MAKESETUP= $(srcdir)/Modules/makese
  4. OPT= @OPT@
  5. BASECFLAGS= @BASECFLAGS@
  6. BASECPPFLAGS= @BASECPPFLAGS@
  7. -CONFIGURE_CFLAGS= @CFLAGS@
  8. -CONFIGURE_CPPFLAGS= @CPPFLAGS@
  9. -CONFIGURE_LDFLAGS= @LDFLAGS@
  10. +CONFIGURE_CFLAGS=
  11. +CONFIGURE_CPPFLAGS=
  12. +CONFIGURE_LDFLAGS=
  13. # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
  14. # command line to append to these values without stomping the pre-set
  15. # values.
  16. @@ -249,6 +249,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
  17. ##########################################################################
  18. # Parser
  19. PGEN= Parser/pgen$(EXE)
  20. +HOSTPGEN?= ./Parser/pgen$(EXE)
  21. PSRCS= \
  22. Parser/acceler.c \
  23. @@ -493,7 +494,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx
  24. *) quiet="";; \
  25. esac; \
  26. $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
  27. - $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
  28. + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py build
  29. # Build static library
  30. # avoid long command lines, same as LIBRARY_OBJS
  31. @@ -669,7 +670,7 @@ $(IO_OBJS): $(IO_H)
  32. $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
  33. @$(MKDIR_P) Include
  34. $(MAKE) $(PGEN)
  35. - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
  36. + $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
  37. $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
  38. $(MAKE) $(GRAMMAR_H)
  39. touch $(GRAMMAR_C)
  40. @@ -1112,28 +1113,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL
  41. $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
  42. $(DESTDIR)$(LIBDEST)/distutils/tests ; \
  43. fi
  44. - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
  45. - $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
  46. - -d $(LIBDEST) -f \
  47. - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
  48. - $(DESTDIR)$(LIBDEST)
  49. - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
  50. - $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
  51. - -d $(LIBDEST) -f \
  52. - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
  53. - $(DESTDIR)$(LIBDEST)
  54. - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
  55. - $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
  56. - -d $(LIBDEST)/site-packages -f \
  57. - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
  58. - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
  59. - $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
  60. - -d $(LIBDEST)/site-packages -f \
  61. - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
  62. - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
  63. - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
  64. - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
  65. - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
  66. # Create the PLATDIR source directory, if one wasn't distributed..
  67. $(srcdir)/Lib/$(PLATDIR):