sip: Update to 4.19.16.
PATCH 1/1 sip: Update to 4.19.16.
* Note SRC_URI changed from SourceForge to Riverbank
Signed-off-by Philip Balister <[email protected]>
---
meta-oe/recipes-devtools/sip/sip.inc | 14 +++++++-------
meta-oe/recipes-devtools/sip/sip3_4.19.13.bb | 11 -----------
meta-oe/recipes-devtools/sip/sip3_4.19.16.bb | 11 +++++++++++
.../sip/{sip_4.19.13.bb => sip_4.19.16.bb} | 0
4 files changed, 18 insertions(+), 18 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/sip/sip3_4.19.13.bb
create mode 100644 meta-oe/recipes-devtools/sip/sip3_4.19.16.bb
rename meta-oe/recipes-devtools/sip/{sip_4.19.13.bb => sip_4.19.16.bb} (100%)meta-oe/recipes-devtools/sip/sip.inc +7 -7
@@ -4,10 +4,10 @@ SECTION = "devel" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz \ +SRC_URI = "https://www.riverbankcomputing.com/static/Downloads/sip/${PV}/sip-${PV}.tar.gz \ " -SRC_URI[md5sum] = "9124cb8978742685747a5415179a9890" -SRC_URI[sha256sum] = "e353a7056599bf5fbd5d3ff9842a6ab2ea3cf4e0304a0f925ec5862907c0d15e" +SRC_URI[md5sum] = "7e854b0da395ddc8fb5da82d0321994d" +SRC_URI[sha256sum] = "184c790d58e9527fc6bdac2bbf8638f3d1b41dea922cad8eb83172b4ba70c620" S = "${WORKDIR}/sip-${PV}"
@@ -15,19 +15,19 @@ BBCLASSEXTEND = "native" do_configure_prepend_class-target() { echo "py_platform = linux" > sip.cfg - echo "py_inc_dir = %(sysroot)/${includedir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> sip.cfg + echo "py_inc_dir = %(sysroot)/${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> 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${PYTHON_BASEVERSION}${PYTHON_ABI}/site-packages" >> 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${PYTHON_BASEVERSION}${PYTHON_ABI}" >> sip.cfg + echo "py_inc_dir = ${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> 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${PYTHON_BASEVERSION}${PYTHON_ABI}/site-packages" >> 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} }
meta-oe/recipes-devtools/sip/sip3_4.19.13.bb deleted +0 -11
@@ -1,11 +0,0 @@ -require sip.inc - -DEPENDS = "python3" - -inherit python3-dir python3native - -PACKAGES += "python3-sip3" - -FILES_python3-sip3 = "${libdir}/${PYTHON_DIR}${PYTHON_ABI}/site-packages/" -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}${PYTHON_ABI}/site-packages/.debug" -
meta-oe/recipes-devtools/sip/sip3_4.19.16.bb new file +11 -0
@@ -0,0 +1,11 @@ +require sip.inc + +DEPENDS = "python3" + +inherit python3-dir python3native + +PACKAGES += "python3-sip3" + +FILES_python3-sip3 = "${libdir}/${PYTHON_DIR}/site-packages/" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" +
meta-oe/recipes-devtools/sip/sip_4.19.16.bb renamed from meta-oe/recipes-devtools/sip/sip_4.19.13.bb +0 -0
Signature · 1 line
2.13.6