diff options
author | Philip Balister <philip@balister.org> | 2007-08-16 21:45:57 +0000 |
---|---|---|
committer | Philip Balister <philip@balister.org> | 2007-08-16 21:45:57 +0000 |
commit | 1aeb81320d30622f09609f5569d302d527b3cef7 (patch) | |
tree | e0d8751fbaf10f4d08bf5058ca79f5484c43a172 /packages/python/python-pyqt/cross-compile.patch | |
parent | 8aef461d33cd252c0d2d3f89a8a6aea3d807f9bf (diff) | |
parent | fe2ab64f4ad985b59b6bbc33d990bb96ed64b607 (diff) |
merge of 'e1d538a40dd18336f9f3f275226a93557d9741cf'
and 'e6ff7fada36b2dd0f2a75f05cada2bc073f0bd4b'
Diffstat (limited to 'packages/python/python-pyqt/cross-compile.patch')
-rw-r--r-- | packages/python/python-pyqt/cross-compile.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/packages/python/python-pyqt/cross-compile.patch b/packages/python/python-pyqt/cross-compile.patch new file mode 100644 index 0000000000..fb1524c09d --- /dev/null +++ b/packages/python/python-pyqt/cross-compile.patch @@ -0,0 +1,33 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- PyQt4-gpl-4.0beta1/configure.py~cross-compile.patch ++++ PyQt4-gpl-4.0beta1/configure.py +@@ -471,7 +471,7 @@ + sipconfig.error("Unable to create the %s directory." % mname) + + # Build the SIP command line. +- argv = ['"' + sipcfg.sip_bin + '"'] ++ argv = ['"' + sipcfg.sip_bin + '4"'] + + argv.extend(qt_sip_flags) + +@@ -846,7 +846,15 @@ + """Set the qt_dir, qt_incdir, qt_libdir, qt_bindir and qt_datadir globals + for the Qt installation. + """ +- sipconfig.inform("Determining the layout of your Qt installation...") ++ sipconfig.inform("Determining the layout of your Qt installation... - patched for OpenEmbedded by :M:") ++ ++ global qt_dir, qt_incdir, qt_libdir, qt_bindir, qt_datadir ++ qt_dir = os.getenv( "QTDIR" ) ++ qt_incdir = "%s/include" % qt_dir ++ qt_libdir = "%s/lib" % qt_dir ++ qt_bindir = "%s/bin" % qt_dir ++ qt_datadir = "%s/share" % qt_dir ++ return + + if not opt_qmake: + sipconfig.error("Make sure you have a working Qt v4 qmake on your PATH or use the -q argument to explicitly specify a working Qt v4 qmake.") |