| diff -rduNp Python-2.4.2.orig/Makefile.pre.in Python-2.4.2/Makefile.pre.in |
| --- Python-2.4.2.orig/Makefile.pre.in 2005-03-29 01:23:01.000000000 +0200 |
| +++ Python-2.4.2/Makefile.pre.in 2007-01-22 19:37:08.000000000 +0100 |
| @@ -162,6 +162,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ |
| |
| PYTHON= python$(EXE) |
| BUILDPYTHON= python$(BUILDEXE) |
| +HOSTPYTHON= $(BUILDPYTHON) |
| |
| # === Definitions added by makesetup === |
| |
| @@ -188,7 +189,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar |
| ########################################################################## |
| # Parser |
| PGEN= Parser/pgen$(EXE) |
| - |
| +HOSTPGEN= $(PGEN)$(EXE) |
| POBJS= \ |
| Parser/acceler.o \ |
| Parser/grammar1.o \ |
| @@ -320,8 +321,8 @@ platform: $(BUILDPYTHON) |
| # Build the shared modules |
| sharedmods: $(BUILDPYTHON) |
| case $$MAKEFLAGS in \ |
| - *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ |
| - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ |
| + *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ |
| + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ |
| esac |
| |
| # buildno should really depend on something like LIBRARY_SRC |
| @@ -442,7 +443,7 @@ Modules/ccpython.o: $(srcdir)/Modules/cc |
| |
| |
| $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) |
| - -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) |
| + -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) |
| |
| $(PGEN): $(PGENOBJS) |
| $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) |
| @@ -719,19 +720,19 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib |
| done |
| $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt |
| PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| - ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ |
| + $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ |
| -d $(LIBDEST) -f \ |
| -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) |
| PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| - ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
| + $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
| -d $(LIBDEST) -f \ |
| -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) |
| -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| - ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ |
| + $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ |
| -d $(LIBDEST)/site-packages -f \ |
| -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
| -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| - ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
| + $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
| -d $(LIBDEST)/site-packages -f \ |
| -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
| |
| @@ -826,7 +827,7 @@ libainstall: all |
| # Install the dynamically loadable modules |
| # This goes into $(exec_prefix) |
| sharedinstall: |
| - $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ |
| + $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \ |
| --prefix=$(prefix) \ |
| --install-scripts=$(BINDIR) \ |
| --install-platlib=$(DESTSHARED) \ |
| diff -rduNp Python-2.4.2.orig/setup.py Python-2.4.2/setup.py |
| --- Python-2.4.2.orig/setup.py 2005-03-09 23:27:24.000000000 +0100 |
| +++ Python-2.4.2/setup.py 2007-01-22 19:37:08.000000000 +0100 |
| @@ -204,6 +204,7 @@ class PyBuildExt(build_ext): |
| try: |
| imp.load_dynamic(ext.name, ext_filename) |
| except ImportError, why: |
| + return |
| self.announce('*** WARNING: renaming "%s" since importing it' |
| ' failed: %s' % (ext.name, why), level=3) |
| assert not self.inplace |
| @@ -239,8 +240,6 @@ class PyBuildExt(build_ext): |
| |
| def detect_modules(self): |
| # Ensure that /usr/local is always used |
| - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') |
| - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
| |
| # Add paths to popular package managers on OS X/darwin |
| if sys.platform == "darwin": |
| @@ -251,12 +250,6 @@ class PyBuildExt(build_ext): |
| add_dir_to_list(self.compiler.library_dirs, '/opt/local/lib') |
| add_dir_to_list(self.compiler.include_dirs, '/opt/local/include') |
| |
| - if os.path.normpath(sys.prefix) != '/usr': |
| - add_dir_to_list(self.compiler.library_dirs, |
| - sysconfig.get_config_var("LIBDIR")) |
| - add_dir_to_list(self.compiler.include_dirs, |
| - sysconfig.get_config_var("INCLUDEDIR")) |
| - |
| try: |
| have_unicode = unicode |
| except NameError: |
