30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
|
Do not run qtdetail
|
||
|
|
|
||
|
|
qtdetail is a tool that generates qtdetail.out. Since this program is
|
||
|
|
cross-compiled, it's not possible to run it on the host.
|
||
|
|
|
||
|
|
Consequently, python-pyqt5.mk generates the qtdetail.out file before
|
||
|
|
calling configure.py.
|
||
|
|
|
||
|
|
Therefore, this patch makes sure that the pre-generated qtdetail.out
|
||
|
|
file is kept, and that qtdetail is not executed.
|
||
|
|
|
||
|
|
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
|
||
|
|
Signed-off-by: Sergey Kostanbaev <sergey.kostanbaev@gmail.com>
|
||
|
|
---
|
||
|
|
Index: PyQt5_gpl-5.7/configure.py
|
||
|
|
===================================================================
|
||
|
|
--- PyQt5_gpl-5.7.orig/configure.py
|
||
|
|
+++ PyQt5_gpl-5.7/configure.py
|
||
|
|
@@ -672,10 +672,6 @@ int main(int argc, char **argv)
|
||
|
|
if cmd is None:
|
||
|
|
error("Failed to determine the detail of your Qt installation. Try again using the --verbose flag to see more detail about the problem.")
|
||
|
|
|
||
|
|
- # Create the output file, first making sure it doesn't exist.
|
||
|
|
- remove_file(out_file)
|
||
|
|
- run_command(cmd, verbose)
|
||
|
|
-
|
||
|
|
if not os.access(out_file, os.F_OK):
|
||
|
|
error("%s failed to create %s. Make sure your Qt installation is correct." % (cmd, out_file))
|
||
|
|
|