#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- Python-2.4c1/Makefile.pre.in~crosscompile
+++ Python-2.4c1/Makefile.pre.in
@@ -162,6 +162,7 @@
PYTHON= python$(EXE)
BUILDPYTHON= python$(BUILDEXE)
+HOSTPYTHON= $(BUILDPYTHON)
# === Definitions added by makesetup ===
@@ -188,7 +189,7 @@
##########################################################################
# Parser
PGEN= Parser/pgen$(EXE)
-
+HOSTPGEN= $(PGEN)$(EXE)
POBJS= \
Parser/acceler.o \
Parser/grammar1.o \
@@ -320,8 +321,8 @@
# 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 @@
$(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)
@@ -718,19 +719,19 @@
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
@@ -825,7 +826,7 @@
# 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) \
--- Python-2.4c1/setup.py~crosscompile
+++ Python-2.4c1/setup.py
@@ -206,6 +206,7 @@
except ImportError, why:
self.announce('*** WARNING: renaming "%s" since importing it'
' failed: %s' % (ext.name, why), level=3)
+ return
assert not self.inplace
basename, tail = os.path.splitext(ext_filename)
newname = basename + "_failed" + tail
@@ -239,8 +240,8 @@
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_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":
@@ -293,6 +294,9 @@
# XXX Omitted modules: gl, pure, dl, SGI-specific modules
+ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ]
+ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ]
+
#
# The following modules are all pretty straightforward, and compile
# on pretty much any POSIXish platform.
taskbar/opie-taskbar?h=rm&id=63666c67e22069c7054a8a1067fecff7c027c425'>opie-taskbar cvs: Patches merged upstream.| Paul Sokolovsky | 1 |
| 2007-07-12 | opie-taskbar: Add patch to get rid of 1-pix stray gap under taskbar. | Paul Sokolovsky | 1 |
| 2007-07-07 | opie-taskbar: restore opie's restartability | Michael Krelin | 1 |
| 2007-07-04 | opie-taskbar: Add missing patch. | Paul Sokolovsky | 1 |
| 2007-05-03 | opie-taskbar cvs: Don't bother to start qss from C++ code. | Paul Sokolovsky | 1 |
| 2007-03-30 | opie-taskbar: Split startup and general configuration files into own package,... | Paul Sokolovsky | 22 |
| 2007-03-12 | opie-taskbar: Be sure to export full set of OPIE envvars to user environment | Paul Sokolovsky | 1 |
| 2007-02-08 | opie-taskbar: init.d/opie: explicitly shut down psplash on opie start, plus | Paul Sokolovsky | 1 |
| 2007-01-14 | opie-taskbar: Remove overriden opie startup file for htcuinversal | Paul Sokolovsky | 1 |
| 2007-01-11 | opie-taskbar: OPIE startup: Run OPIE on VT 3, as a workaround for psplash iss... | Paul Sokolovsky | 1 |
| 2007-01-11 | opie-taskbar: OPIE startup: if touchscreen device is not available, use mouse. | Paul Sokolovsky | 1 |
| 2007-01-09 | opie-taskbar: Comment out getkey calls, as no longer available with current O... | Paul Sokolovsky | 3 |
| 2006-07-11 | opie-taskbar 1.2.2 add dedicated qpe.conf for htcuniversal | Michael Lauer | 1 |
| 2006-06-28 | opie-taskbar: c7x0 w/ w100 acceleration needs a special suspend/resume script | Michael Lauer | 1 |
| 2006-06-22 | tslib|opie-taskbar: remove opie mouse hack for htcuniversal in tslib.sh and a... | Michael Lauer | 2 |
| 2006-05-15 | opie-taskbar: Poodle: Fix cursor rotation for kernel 2.6 images. Might also b... | Matthias Hentges | 1 |
| 2006-04-08 | * Remove 2.4 machine support for c7x0, akita, spitz and borzoi. | Richard Purdie | 2 |
| 2005-08-22 | add support for the Sharp SL-C3100 (Borzoi) | Michael Lauer | 2 |
| 2005-08-08 | Beagle: | Holger Freyther | 2 |
| 2005-07-27 | update attributes | Michael Lauer | 1 |
| 2005-07-26 | opie-taskbar: qpe.conf: use Windows (*cough*) style on hires models | Michael Lauer | 4 |
| 2005-07-22 | Opie-Taskbar: remove hard coded QWS_DISPLAY setting from initscript | Michael Lauer | 2 |
| 2005-07-01 | Opie: set default font size to 16pt on hires devices | Michael Lauer | 5 |
| 2005-06-30 | opie-taskbar: /etc/init.d/opie: copy $OPIEDIR/etc/skel/*.conf into $HOME/Sett... | Michael Lauer | 1 |
| 2005-06-30 | import clean BK tree at cset 1.3670 | Koen Kooi | 16 |
| 2005-06-29 | opie-taskbar: catch up default qpe.conf w/ new auto generated ttf names | Michael Lauer | 6 |
| 2005-06-28 | Merge bk://oe-devel@oe-devel.bkbits.net/openembedded | Michael Lauer | 6 |
| 2005-06-15 | Merge bk://oe-devel.bkbits.net/openembedded | John Bowler | 4 |
| 2005-06-11 | Merge bk://oe-devel.bkbits.net/openembedded | nslu2-linux.adm@bkbits.net | 6 |
| 2005-04-05 | Merge bk://oe-devel@oe-devel.bkbits.net/openembedded | Michael Lauer | 4 |
| 2005-03-31 | Merge bk://oe-devel.bkbits.net/openembedded | nslu2-linux.adm@bkbits.net | 4 |
| 2005-03-30 | Merge bk://oe-devel.bkbits.net/openembedded | nslu2-linux.adm@bkbits.net | 3 |
| 2005-03-26 | Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded | g2@giantshoulder.com | 1 |
| 2005-02-18 | assorted changes for MNCI "Ramses" | Holger Schurig | 2 |
| 2005-02-17 | Merge bk://oe-devel@oe-devel.bkbits.net/openembedded | Michael Lauer | 1 |
| 2005-02-17 | Merge http://oe-devel@openembedded.bkbits.net/openembedded | Holger Schurig | 2 |
| 2005-02-15 | catch up with new default fonts and remove the beagle-specific hack which is ... | Michael Lauer | 4 |
| 2005-02-14 | consolidate collie, shepherd, husky into the common machine c7x0. kernel 2.6 ... | Michael Lauer | 3 |
| 2005-02-13 | Add KERNEL_VERSION option to select kernel preference for zaurus clamshells. ... | Richard Purdie | 1 |
| 2005-02-10 | opie-taskbar: root $HOME is /home/root/ now | Marcin Juszkiewicz | 1 |
| 2005-02-02 | Merge bk://oe-devel@oe-devel.bkbits.net/openembedded | Michael Lauer | 1 |
| 2005-01-23 | Merge bk://oe-devel@oe-devel.bkbits.net/openembedded | Michael Lauer | 2 |
| 2005-01-14 | Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded | Rod Whitby | 1 |
| 2005-01-07 | Merge bk://oe-devel.bkbits.net/openembedded | nslu2-linux.adm@bkbits.net | 2 |
| 2004-12-26 | Merge bk://oe-devel.bkbits.net/openembedded | nslu2-linux.adm@bkbits.net | 1 |
| 2004-12-23 | Merge bk://oe-devel@oe-devel.bkbits.net/openembedded | Michael Lauer | 1 |
| 2004-12-09 | Merge oe-devel@oe-devel.bkbits.net:openembedded | Chris Larson | 17 |