Skip to contentSkip to conversation

python-pyqt: fix install

PATCH New Gwenhael Goavec-Merou 3 participants 6 messages May 5, 2015 – May 17, 2015

lore
Share & tools
lore

Gwenhael Goavec-Merou

author
#0 lore raw

PATCH v3 1/2 python-pyqt: fix install

From: Gwenhael Goavec-Merou <[email protected]>

PyQt4 provides two version for some py files: one for python2.x and one for python3.x. This two versions are installed in TARGET_DIR.
After installing files, python is used to generate all .pyc files, but fails like :
class ProxyBase(metaclass=ProxyMetaclass):
^
SyntaxError: invalid syntax

This is not a package build failure and this fix is only cosmetic. This patch suppress directory for not targeted python version.

Signed-off-by Gwenhael Goavec-Merou <[email protected]>
---
 package/python-pyqt/python-pyqt.mk | 3 +++
 1 file changed, 3 insertions(+)
package/python-pyqt/python-pyqt.mk +3 -0
index c151dfd..d6587a8 100644
@@ -14,8 +14,10 @@ PYTHON_PYQT_DEPENDENCIES = python-sip host-python-sip qt
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 PYTHON_PYQT_PYTHON_DIR = python$(PYTHON_VERSION_MAJOR)
+PYTHON_PYQT_RM_PORT_BASE = port_v3
 else ifeq ($(BR2_PACKAGE_PYTHON3),y)
 PYTHON_PYQT_PYTHON_DIR = python$(PYTHON3_VERSION_MAJOR)
+PYTHON_PYQT_RM_PORT_BASE = port_v2
 endif
 
 ifeq ($(BR2_PACKAGE_QT_EMBEDDED),y)

@@ -104,6 +106,7 @@ endef
 define PYTHON_PYQT_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install
 	touch $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages/PyQt4/__init__.py
+	$(RM) -rf $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages/PyQt4/uic/$(PYTHON_PYQT_RM_PORT_BASE)
 	PYTHONPATH="$(PYTHON_PATH)" \
 		$(HOST_DIR)/usr/bin/python -c "import compileall; \
 		compileall.compile_dir('$(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages/PyQt4')"
Signature · 1 line
2.0.5
author
#1 lore raw

PATCH v3 2/2 qt: fix webkit dependencies

From: Gwenhael Goavec-Merou <[email protected]>

fix:
http://autobuild.buildroot.net/results/ce8/ce89ad1ca6aec9f7bb5549301bf4c0dcba9e0e37/

qtwebkit includes qscript headers.
For packages like python-pyqt if webkit is available but not qscript, the compilation fails with :
buildroot/output/build/python-pyqt-4.11.3/sip/QtWebKit/qwebframe.sip:79:0:
../../../host/usr/i686-buildroot-linux-gnu/sysroot/usr/include/QtWebKit/qwebframe.h:28:36:
fatal error: QtScript/qscriptengine.h: No such file or directory

This problem is not seen with Qt compilation because some relative include directly from sources are added.

Signed-off-by Gwenhael Goavec-Merou <[email protected]>
---
 package/qt/Config.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/qt/Config.in +3 -1
index 43f5a0f..f6ca054 100644
@@ -417,6 +417,7 @@ config BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
 
 config BR2_PACKAGE_QT_WEBKIT
 	bool "WebKit Module"
+	depends on BR2_PACKAGE_QT_SCRIPT
 	depends on BR2_PACKAGE_QT_SHARED
 	depends on BR2_PACKAGE_QT_GUI_MODULE
 	depends on BR2_PACKAGE_QT_NETWORK

@@ -427,7 +428,8 @@ config BR2_PACKAGE_QT_WEBKIT
 	  If unsure, say n.
 
 comment "WebKit needs shared library/NPTL toolchain/gui/network support"
-	depends on !(BR2_PACKAGE_QT_SHARED && BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK)
+	depends on !(BR2_PACKAGE_QT_SCRIPT && BR2_PACKAGE_QT_SHARED && \
+		BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK)
 	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
Signature · 1 line
2.0.5
#2 lore raw

PATCH v3 1/2 python-pyqt: fix install

In reply to Gwenhael Goavec-Merou
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gwenhael" == Gwenhael Goavec-Merou <[email protected]> writes:

From: Gwenhael Goavec-Merou <[email protected]> PyQt4 provides two version for some py files: one for python2.x and one for python3.x. This two versions are installed in TARGET_DIR.
After installing files, python is used to generate all .pyc files, but fails like :
class ProxyBase(metaclass=ProxyMetaclass):
^
SyntaxError: invalid syntax

Quoted 2 lines

This is not a package build failure and this fix is only cosmetic. This patch suppress directory for not targeted python version.

Do we have any autobuilder results showing this?

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH v3 1/2 python-pyqt: fix install

Dear Peter Korsgaard,

Quoted 4 lines · Peter Korsgaard
Quoted 2 lines

This is not a package build failure and this fix is only cosmetic. This patch suppress directory for not targeted python version.

Do we have any autobuilder results showing this?

Read two lines before :-)

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#4 lore raw

PATCH v3 1/2 python-pyqt: fix install

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Dear Peter Korsgaard,

Quoted 4 lines · Peter Korsgaard
Quoted 2 lines

This is not a package build failure and this fix is only cosmetic. This patch suppress directory for not targeted python version.

Do we have any autobuilder results showing this?

Read two lines before :-)

Doh, seems like I need more coffee.

Signature · 2 lines
Venlig hilsen,
Peter Korsgaard
#5 lore raw

PATCH v3 1/2 python-pyqt: fix install

In reply to Gwenhael Goavec-Merou
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gwenhael" == Gwenhael Goavec-Merou <[email protected]> writes:

From: Gwenhael Goavec-Merou <[email protected]> PyQt4 provides two version for some py files: one for python2.x and one for python3.x. This two versions are installed in TARGET_DIR.
After installing files, python is used to generate all .pyc files, but fails like :
class ProxyBase(metaclass=ProxyMetaclass):
^
SyntaxError: invalid syntax

Quoted 4 lines

This is not a package build failure and this fix is only cosmetic. This patch suppress directory for not targeted python version.

Signed-off-by Gwenhael Goavec-Merou <[email protected]>

Sorry, just to be clear - It was the v3 versions I committed.

Signature · 1 line
Bye, Peter Korsgaard