python3-pyqt5: remove - use meta-qt5's recipe
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -1,31 +0,0 @@
|
||||
From f583921012ed1f4e853f41d4fd3d95d1a819ac03 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 4 Aug 2018 02:48:14 +0200
|
||||
Subject: [PATCH] Make sure to find python3 sip code generator
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
configure.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.py b/configure.py
|
||||
index a263efb..daefc0e 100644
|
||||
--- a/configure.py
|
||||
+++ b/configure.py
|
||||
@@ -522,7 +522,7 @@ class TargetConfiguration:
|
||||
self.qtconf_prefix = ''
|
||||
self.qt_shared = False
|
||||
self.qt_version = 0
|
||||
- self.sip = self._find_exe('sip5', 'sip')
|
||||
+ self.sip = self._find_exe('sip3')
|
||||
self.sip_h_version = None
|
||||
self.sip_inc_dir = self.py_venv_inc_dir
|
||||
self.static = False
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
SUMMARY = "Python Qt5 Bindings"
|
||||
AUTHOR = "Phil Thomson @ riverbank.co.uk"
|
||||
HOMEPAGE = "http://riverbankcomputing.co.uk"
|
||||
SECTION = "devel/python"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
SRC_URI = "\
|
||||
https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-${PV}/PyQt5_gpl-${PV}.tar.gz \
|
||||
file://0001-Make-sure-to-find-python3-sip-code-generator.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "33d6d2ab8183da17ac18b8132a4b278e"
|
||||
SRC_URI[sha256sum] = "c190dac598c97b0113ca5e7a37c71c623f02d1d713088addfacac4acfa4b8394"
|
||||
|
||||
PE = "1"
|
||||
|
||||
inherit qmake5 python3native
|
||||
|
||||
DEPENDS += "sip3-native sip3 qtbase python3"
|
||||
DEPENDS_append_class-target = "qtsvg"
|
||||
|
||||
S = "${WORKDIR}/PyQt5_gpl-${PV}"
|
||||
B = "${S}"
|
||||
|
||||
DISABLED_FEATURES = "PyQt_Desktop_OpenGL"
|
||||
|
||||
DISABLED_FEATURES_append_arm = " PyQt_qreal_double"
|
||||
|
||||
PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets QtSvg"
|
||||
PYQT_MODULES_class-native = "QtCore"
|
||||
PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork QtWidgets QtSvg"
|
||||
|
||||
# full paths
|
||||
SYSROOTDIR = "${STAGING_DIR_HOST}"
|
||||
SYSROOTDIR_class-native = "${STAGING_DIR_NATIVE}"
|
||||
INCLUDEDIR = "${STAGING_INCDIR}"
|
||||
INCLUDEDIR_class-native = "${STAGING_INCDIR_NATIVE}"
|
||||
LIBDIR = "${STAGING_LIBDIR}"
|
||||
LIBDIR_class-native = "${STAGING_LIBDIR_NATIVE}"
|
||||
PYTHONEXEC="${bindir}/${PYTHON_PN}"
|
||||
PYTHONEXEC_class-native="${PYTHON}"
|
||||
|
||||
do_configure() {
|
||||
echo "py_platform = linux" > pyqt.cfg
|
||||
echo "py_inc_dir = ${INCLUDEDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg
|
||||
echo "py_pylib_dir = ${LIBDIR}/python${PYTHON_BASEVERSION}" >> pyqt.cfg
|
||||
echo "py_pylib_lib = python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg
|
||||
echo "pyqt_module_dir = ${D}/${PYTHON_SITEPACKAGES_DIR}" >> pyqt.cfg
|
||||
echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg
|
||||
echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg
|
||||
echo "pyuic_interpreter = ${PYTHONEXEC}" >> pyqt.cfg
|
||||
echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg
|
||||
echo "qt_shared = True" >> pyqt.cfg
|
||||
QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION`
|
||||
echo "[Qt $QT_VERSION]" >> pyqt.cfg
|
||||
echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg
|
||||
echo yes | python3 configure.py --verbose --qmake ${OE_QMAKE_QMAKE} --configuration pyqt.cfg --sysroot ${SYSROOTDIR}
|
||||
}
|
||||
|
||||
do_install() {
|
||||
oe_runmake install
|
||||
}
|
||||
|
||||
do_install_class-native() {
|
||||
oe_runmake install
|
||||
}
|
||||
|
||||
RDEPENDS_${PN}_append_class-target = " python3-core python3-sip"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${libdir}/${PYTHON_DIR}/site-packages \
|
||||
${datadir}/sip/PyQt5 \
|
||||
"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
Reference in New Issue
Block a user