crosscompile.patch 4.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108
  1. #
  2. # Patch managed by http://www.holgerschurig.de/patcher.html
  3. #
  4. --- Python-2.4c1/Makefile.pre.in~crosscompile
  5. +++ Python-2.4c1/Makefile.pre.in
  6. @@ -162,6 +162,7 @@
  7. PYTHON= python$(EXE)
  8. BUILDPYTHON= python$(BUILDEXE)
  9. +HOSTPYTHON= $(BUILDPYTHON)
  10. # === Definitions added by makesetup ===
  11. @@ -188,7 +189,7 @@
  12. ##########################################################################
  13. # Parser
  14. PGEN= Parser/pgen$(EXE)
  15. -
  16. +HOSTPGEN= $(PGEN)$(EXE)
  17. POBJS= \
  18. Parser/acceler.o \
  19. Parser/grammar1.o \
  20. @@ -320,8 +321,8 @@
  21. # Build the shared modules
  22. sharedmods: $(BUILDPYTHON)
  23. case $$MAKEFLAGS in \
  24. - *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
  25. - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
  26. + *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
  27. + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
  28. esac
  29. # buildno should really depend on something like LIBRARY_SRC
  30. @@ -442,7 +443,7 @@
  31. $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
  32. - -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
  33. + -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
  34. $(PGEN): $(PGENOBJS)
  35. $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
  36. @@ -718,19 +719,19 @@
  37. done
  38. $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
  39. PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
  40. - ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
  41. + $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
  42. -d $(LIBDEST) -f \
  43. -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
  44. PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
  45. - ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
  46. + $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
  47. -d $(LIBDEST) -f \
  48. -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
  49. -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
  50. - ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
  51. + $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
  52. -d $(LIBDEST)/site-packages -f \
  53. -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
  54. -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
  55. - ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
  56. + $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
  57. -d $(LIBDEST)/site-packages -f \
  58. -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
  59. @@ -825,7 +826,7 @@
  60. # Install the dynamically loadable modules
  61. # This goes into $(exec_prefix)
  62. sharedinstall:
  63. - $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
  64. + $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
  65. --prefix=$(prefix) \
  66. --install-scripts=$(BINDIR) \
  67. --install-platlib=$(DESTSHARED) \
  68. --- Python-2.4c1/setup.py~crosscompile
  69. +++ Python-2.4c1/setup.py
  70. @@ -206,6 +206,7 @@
  71. except ImportError, why:
  72. self.announce('*** WARNING: renaming "%s" since importing it'
  73. ' failed: %s' % (ext.name, why), level=3)
  74. + return
  75. assert not self.inplace
  76. basename, tail = os.path.splitext(ext_filename)
  77. newname = basename + "_failed" + tail
  78. @@ -239,8 +240,8 @@
  79. def detect_modules(self):
  80. # Ensure that /usr/local is always used
  81. - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
  82. - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
  83. + # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
  84. + # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
  85. # Add paths to popular package managers on OS X/darwin
  86. if sys.platform == "darwin":
  87. @@ -293,6 +294,9 @@
  88. # XXX Omitted modules: gl, pure, dl, SGI-specific modules
  89. + lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ]
  90. + inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ]
  91. +
  92. #
  93. # The following modules are all pretty straightforward, and compile
  94. # on pretty much any POSIXish platform.