sources/python25/Makefile.pre.in.patch

   1 --- Python-2.5.2c1/Makefile.pre.in.orig 2007-12-05 12:43:57.000000000 -0800
   2 +++ Python-2.5.2c1/Makefile.pre.in      2008-02-15 13:39:38.000000000 -0800
   3 @@ -36,6 +36,8 @@
   4  RANLIB=                @RANLIB@
   5  SVNVERSION=    @SVNVERSION@
   6
   7 +CROSS_COMPILE= @CROSS_COMPILE@
   8 +
   9  # Shell used by make (some versions default to the login shell, which is bad)
  10  SHELL=         /bin/sh
  11
  12 @@ -102,7 +104,7 @@
  13
  14  # Symbols used for using shared libraries
  15  SO=            @SO@
  16 -LDSHARED=      @LDSHARED@
  17 +LDSHARED=      @LDSHARED@ @LDFLAGS@
  18  BLDSHARED=     @BLDSHARED@
  19  DESTSHARED=    $(BINLIBDEST)/lib-dynload
  20
  21 @@ -172,7 +174,8 @@
  22  UNICODE_OBJS=   @UNICODE_OBJS@
  23
  24  PYTHON=                python$(EXE)
  25 -BUILDPYTHON=   python$(BUILDEXE)
  26 +HOSTPYTHON=    python$(BUILDEXE)
  27 +BUILDPYTHON=   @BUILDPYTHON@
  28
  29  # === Definitions added by makesetup ===
  30
  31 @@ -198,7 +201,8 @@
  32
  33  ##########################################################################
  34  # Parser
  35 -PGEN=          Parser/pgen$(EXE)
  36 +HOSTPGEN=      Parser/pgen$(EXE)
  37 +BUILDPGEN=     @BUILDPGEN@
  38
  39  POBJS=         \
  40                 Parser/acceler.o \
  41 @@ -333,13 +337,13 @@
  42  # Rules
  43
  44  # Default target
  45 -all:           $(BUILDPYTHON) oldsharedmods sharedmods
  46 +all:           $(HOSTPYTHON) oldsharedmods sharedmods
  47
  48  # Build the interpreter
  49 -$(BUILDPYTHON):        Modules/python.o $(LIBRARY) $(LDLIBRARY)
  50 -               $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
  51 +$(HOSTPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY)
  52 +               $(LINKCC) -o $@ \
  53                         Modules/python.o \
  54 -                       $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  55 +                       $(BLDLIBRARY) $(LDFLAGS) $(LINKFORSHARED) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  56
  57  platform: $(BUILDPYTHON)
  58         $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
  59 @@ -472,12 +476,12 @@
  60         $(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
  61
  62
  63 -$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
  64 +$(GRAMMAR_H) $(GRAMMAR_C): $(BUILDPGEN) $(GRAMMAR_INPUT)
  65                 -@ mkdir Include
  66 -               -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
  67 +               -$(BUILDPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
  68
  69 -$(PGEN):       $(PGENOBJS)
  70 -               $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
  71 +$(HOSTPGEN):   $(PGENOBJS)
  72 +               $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(HOSTPGEN)
  73
  74  Parser/grammar.o:      $(srcdir)/Parser/grammar.c \
  75                                 $(srcdir)/Include/token.h \
  76 @@ -503,6 +507,16 @@
  77  Objects/unicodectype.o:        $(srcdir)/Objects/unicodectype.c \
  78                                 $(srcdir)/Objects/unicodetype_db.h
  79
  80 +#########################################################################
  81 +# Rules for making python/pgen that will run on the build system
  82 +# (only used for cross compiles)
  83 +
  84 +buildpython25/python$(BUILDEXE):
  85 +       cd buildpython25; make all; cd ..
  86 +
  87 +buildpython25/Parser/pgen$(BUILDEXE):
  88 +       cd buildpython25; make Parser/pgen; cd ..
  89 +
  90  ############################################################################
  91  # Header files
  92
  93 @@ -673,7 +687,7 @@
  94                 else    true; \
  95                 fi; \
  96         done
  97 -       $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
  98 +       $(INSTALL_PROGRAM) $(HOSTPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
  99         if test -f libpython$(VERSION)$(SO); then \
 100                 if test "$(SO)" = .dll; then \
 101                         $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(DESTDIR)$(BINDIR); \
 102 @@ -894,8 +908,9 @@
 103  # Install the dynamically loadable modules
 104  # This goes into $(exec_prefix)
 105  sharedinstall:
 106 -       $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
 107 -               --prefix=$(prefix) \
 108 +       CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CROSS_COMPILE='$(CROSS_COMPILE)' \
 109 +               $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
 110 +               --prefix=$(prefix) \
 111                 --install-scripts=$(BINDIR) \
 112                 --install-platlib=$(DESTSHARED) \
 113                 --root=/$(DESTDIR)
 114 @@ -982,7 +997,7 @@
 115  config.status: $(srcdir)/configure
 116         $(SHELL) $(srcdir)/configure $(CONFIG_ARGS)
 117
 118 -.PRECIOUS: config.status $(BUILDPYTHON) Makefile Makefile.pre
 119 +.PRECIOUS: config.status $(HOSTPYTHON) Makefile Makefile.pre
 120
 121  # Some make's put the object file in the current directory
 122  .c.o:
 123 @@ -1029,11 +1044,12 @@
 124         find $(srcdir)/build -name 'fficonfig.py' -exec rm -f {} ';' || true
 125
 126  clobber: clean
 127 -       -rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
 128 +       -rm -f $(HOSTPYTHON) $(HOSTPGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
 129                 tags TAGS \
 130                 config.cache config.log pyconfig.h Modules/config.c
 131         -rm -rf build platform
 132         -rm -rf $(PYTHONFRAMEWORKDIR)
 133 +       -rm -rf buildpython25
 134
 135  # Make things extra clean, before making a distribution:
 136  # remove all generated files, even Makefile[.pre]