From 26f251fb1e0d2b5d7c2179504a6984020292fc5f Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Fri, 7 Sep 2018 22:59:10 -0400 Subject: sip: Update from 4.19.8 to 4.19.12. * This builds the private sip module for building PyQt5. In the future we should split into a -tools and -modules. But lets fix building for now Signed-off-by: Philip Balister Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/sip/files/sip.patch | 16 ++++++++++ meta-oe/recipes-devtools/sip/sip_4.19.12.bb | 44 ++++++++++++++++++++++++++++ meta-oe/recipes-devtools/sip/sip_4.19.8.bb | 42 -------------------------- 3 files changed, 60 insertions(+), 42 deletions(-) create mode 100644 meta-oe/recipes-devtools/sip/files/sip.patch create mode 100644 meta-oe/recipes-devtools/sip/sip_4.19.12.bb delete mode 100644 meta-oe/recipes-devtools/sip/sip_4.19.8.bb (limited to 'meta-oe/recipes-devtools/sip') diff --git a/meta-oe/recipes-devtools/sip/files/sip.patch b/meta-oe/recipes-devtools/sip/files/sip.patch new file mode 100644 index 0000000000..78100fc4ba --- /dev/null +++ b/meta-oe/recipes-devtools/sip/files/sip.patch @@ -0,0 +1,16 @@ +diff -Nurd ./sip-4.19.12.orig/configure.py sip-4.19.12/configure.py +--- ./sip-4.19.12.orig/configure.py 2018-07-05 05:55:19.000000000 -0400 ++++ sip-4.19.12/configure.py 2018-09-07 16:41:18.102569271 -0400 +@@ -949,10 +949,10 @@ + + if len(module_path) > 1: + del module_path[-1] +- module_path.insert(0, sip_root_dir) ++ module_path.insert(0, sip_module_dir) + sip_module_dir = os.path.join(*module_path) + else: +- sip_module_dir = sip_root_dir ++ sip_module_dir = sip_module_dir + + # Override from the command line. + if opts.platform is not None: diff --git a/meta-oe/recipes-devtools/sip/sip_4.19.12.bb b/meta-oe/recipes-devtools/sip/sip_4.19.12.bb new file mode 100644 index 0000000000..be384fd395 --- /dev/null +++ b/meta-oe/recipes-devtools/sip/sip_4.19.12.bb @@ -0,0 +1,44 @@ +SUMMARY = "SIP is a C++/Python Wrapper Generator" +HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" +SECTION = "devel" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" + +DEPENDS = "python" + +inherit python-dir pythonnative + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz \ + file://sip.patch \ + " +SRC_URI[md5sum] = "e28b0790dfe4962ce6bbd7c4772f40c9" +SRC_URI[sha256sum] = "24617fc31b983df075500ecac0e99d2fb48bf63ba82d4a17518659e571923822" + +BBCLASSEXTEND = "native" + +PACKAGES += "python-sip" + +do_configure_prepend_class-target() { + echo "py_platform = linux" > sip.cfg + echo "py_inc_dir = %(sysroot)/${includedir}/python%(py_major).%(py_minor)" >> sip.cfg + echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg + echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg + echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg + echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg + python configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot ${STAGING_DIR_HOST} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}" +} +do_configure_prepend_class-native() { + echo "py_platform = linux" > sip.cfg + echo "py_inc_dir = ${includedir}/python%(py_major).%(py_minor)" >> sip.cfg + echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg + echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg + echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg + echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg + python configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot=${STAGING_DIR_NATIVE} +} +do_install() { + oe_runmake install +} + +FILES_python-sip = "${libdir}/${PYTHON_DIR}/site-packages/" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" diff --git a/meta-oe/recipes-devtools/sip/sip_4.19.8.bb b/meta-oe/recipes-devtools/sip/sip_4.19.8.bb deleted file mode 100644 index ea944b32ff..0000000000 --- a/meta-oe/recipes-devtools/sip/sip_4.19.8.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "SIP is a C++/Python Wrapper Generator" -HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" -SECTION = "devel" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" - -inherit python-dir - -DEPENDS = "python" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz" -SRC_URI[md5sum] = "0625fb20347d4ff1b5da551539be0727" -SRC_URI[sha256sum] = "7eaf7a2ea7d4d38a56dd6d2506574464bddf7cf284c960801679942377c297bc" - -BBCLASSEXTEND = "native" - -PACKAGES += "python-sip" - -do_configure_prepend_class-target() { - echo "py_platform = linux" > sip.cfg - echo "py_inc_dir = %(sysroot)/${includedir}/python%(py_major).%(py_minor)" >> sip.cfg - echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg - echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg - echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg - echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg - python configure.py --configuration sip.cfg --sysroot ${STAGING_DIR_HOST} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}" -} -do_configure_prepend_class-native() { - echo "py_platform = linux" > sip.cfg - echo "py_inc_dir = ${includedir}/python%(py_major).%(py_minor)" >> sip.cfg - echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg - echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg - echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg - echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg - python configure.py --configuration sip.cfg --sysroot ${STAGING_DIR_NATIVE} -} -do_install() { - oe_runmake install -} - -FILES_python-sip = "${libdir}/${PYTHON_DIR}/site-packages/" -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" -- cgit 1.2.3-korg