diff options
| author | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-08-16 18:05:01 +0000 |
|---|---|---|
| committer | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-08-16 18:05:01 +0000 |
| commit | fe2ab64f4ad985b59b6bbc33d990bb96ed64b607 (patch) | |
| tree | 13d0e8112c403b6ac6e91a359e12f66297c14922 /packages/python/python-pyqt | |
| parent | a029c974983879c1f656d655158ed8a62b241952 (diff) | |
| parent | 623fb64de43b262e242dca42e1e625387c8810f9 (diff) | |
merge of 'ae5744fa10248e83339259dfc0764f954c5b3456'
and 'd2ff855675080c5ae36403d11904698712868163'
Diffstat (limited to 'packages/python/python-pyqt')
| -rw-r--r-- | packages/python/python-pyqt/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/python/python-pyqt/cross-compile.patch | 33 |
2 files changed, 33 insertions, 0 deletions
diff --git a/packages/python/python-pyqt/.mtn2git_empty b/packages/python/python-pyqt/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-pyqt/.mtn2git_empty 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.") |