Date: Thu, 10 Dec 2020 16:13:59 +0000 (UTC) From: =?UTF-8?Q?Lo=c3=afc_Bartoletti?= <lbartoletti@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r557442 - in head: Mk/Uses devel/py-qt5-qscintilla2 www/py-qt5-webengine x11-toolkits/py-qt5-chart Message-ID: <202012101613.0BAGDxoZ040084@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lbartoletti Date: Thu Dec 10 16:13:59 2020 New Revision: 557442 URL: https://svnweb.freebsd.org/changeset/ports/557442 Log: PyQt: fix flavors py-qt modules require sip-module to build, unfortunately, it is hardcoded and links to the default python version. There is no option to pass it in like sip binary, so we need to patch configure.py file. Reported by: fluffy Approved by: fluffy Modified: head/Mk/Uses/pyqt.mk head/devel/py-qt5-qscintilla2/Makefile head/www/py-qt5-webengine/Makefile head/x11-toolkits/py-qt5-chart/Makefile Modified: head/Mk/Uses/pyqt.mk ============================================================================== --- head/Mk/Uses/pyqt.mk Thu Dec 10 15:36:03 2020 (r557441) +++ head/Mk/Uses/pyqt.mk Thu Dec 10 16:13:59 2020 (r557442) @@ -250,6 +250,7 @@ EXTRACT_AFTER_ARGS+= --exclude "${DISTNAME}/dbus" . if !target(do-configure) do-configure: + ${REINPLACE_CMD} -e "s/sip-module/sip-module-${PYTHON_VER}/" ${WRKSRC}/configure.py cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} . endif # !target(do-configure) Modified: head/devel/py-qt5-qscintilla2/Makefile ============================================================================== --- head/devel/py-qt5-qscintilla2/Makefile Thu Dec 10 15:36:03 2020 (r557441) +++ head/devel/py-qt5-qscintilla2/Makefile Thu Dec 10 16:13:59 2020 (r557442) @@ -33,6 +33,9 @@ CONFIGURE_ARGS= --pyqt PyQt5 -d ${PYTHONPREFIX_SITELIB WRKSRC= ${WRKDIR}/${DISTNAME}/Python ALL_TARGET= #empty +post-patch: + ${REINPLACE_CMD} -e "s/sip-module/sip-module-${PYTHON_VER}/" ${WRKSRC}/configure.py + do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} Modified: head/www/py-qt5-webengine/Makefile ============================================================================== --- head/www/py-qt5-webengine/Makefile Thu Dec 10 15:36:03 2020 (r557441) +++ head/www/py-qt5-webengine/Makefile Thu Dec 10 16:13:59 2020 (r557442) @@ -44,6 +44,9 @@ PLIST_SUB= PYQT_WEBENGINE_VERSION=${DISTVERSION} post-install-DEBUG-off: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/PyQt5/QtWebEngine*.so +post-patch: + ${REINPLACE_CMD} -e "s/sip-module/sip-module-${PYTHON_VER}/" ${WRKSRC}/configure.py + do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} Modified: head/x11-toolkits/py-qt5-chart/Makefile ============================================================================== --- head/x11-toolkits/py-qt5-chart/Makefile Thu Dec 10 15:36:03 2020 (r557441) +++ head/x11-toolkits/py-qt5-chart/Makefile Thu Dec 10 16:13:59 2020 (r557442) @@ -40,11 +40,12 @@ API_CONFIGURE_OFF= --no-qsci-api API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5 DEBUG_CONFIGURE_ON= --debug --trace -.if !target(do-configure) +post-patch: + ${REINPLACE_CMD} -e "s/sip-module/sip-module-${PYTHON_VER}/" ${WRKSRC}/configure.py + do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} -.endif # !target(do-configure) post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtChart.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012101613.0BAGDxoZ040084>