1 Index: Python-2.5.1/Makefile.pre.in
2 ===================================================================
3 --- Python-2.5.1.orig/Makefile.pre.in 2007-07-30 12:55:24.000000000 -0500
4 +++ Python-2.5.1/Makefile.pre.in 2007-07-30 12:55:24.000000000 -0500
8 BUILDPYTHON= python$(BUILDEXE)
9 +HOSTPYTHON= $(BUILDPYTHON)
11 # === Definitions added by makesetup ===
14 ##########################################################################
16 PGEN= Parser/pgen$(EXE)
18 +HOSTPGEN= $(PGEN)$(EXE)
23 # Build the shared modules
24 sharedmods: $(BUILDPYTHON)
26 - *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
27 - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
28 + *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
29 + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
32 # Build static library
36 $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
38 - -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
39 + -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
42 $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
44 # Install the dynamically loadable modules
45 # This goes into $(exec_prefix)
47 - $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
48 + $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
50 --install-scripts=$(BINDIR) \
51 --install-platlib=$(DESTSHARED) \
52 Index: Python-2.5.1/setup.py
53 ===================================================================
54 --- Python-2.5.1.orig/setup.py 2007-07-30 12:55:24.000000000 -0500
55 +++ Python-2.5.1/setup.py 2007-07-30 12:57:10.000000000 -0500
58 imp.load_dynamic(ext.name, ext_filename)
59 except ImportError, why:
61 self.announce('*** WARNING: renaming "%s" since importing it'
62 ' failed: %s' % (ext.name, why), level=3)
63 assert not self.inplace
66 def detect_modules(self):
67 # Ensure that /usr/local is always used
68 - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
69 - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
71 # Add paths specified in the environment variables LDFLAGS and
72 # CPPFLAGS for header and library files.
74 for directory in options.dirs:
75 add_dir_to_list(dir_list, directory)
77 - if os.path.normpath(sys.prefix) != '/usr':
78 - add_dir_to_list(self.compiler.library_dirs,
79 - sysconfig.get_config_var("LIBDIR"))
80 - add_dir_to_list(self.compiler.include_dirs,
81 - sysconfig.get_config_var("INCLUDEDIR"))
84 have_unicode = unicode