Date: Sun, 24 Nov 2019 08:39:31 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518302 - in head: Mk/Uses devel/py-sip Message-ID: <201911240839.xAO8dVuU012040@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sun Nov 24 08:39:30 2019 New Revision: 518302 URL: https://svnweb.freebsd.org/changeset/ports/518302 Log: devel/py-sip: doesn't honor sip_dir pyqt.mk had a long standing bug, where the sip-dir was not properly set for the port devel/py-sip. The underlying issue was the following: When using pyqt.mk consumers would specify USES=pyqt:<version> To also have easy access for the data from pyqt.mk in the py-sip port, we allowed version=sip, which only unhides a very limited scope of pyqt.mk. However, we also set _VERSION_SUBDIR_REL= PyQt${_PYQT_VERSION}/${PYTHON_VER} and used that in _SIPDIR_REL= share/${_VERSION_SUBDIR_REL}/sip PYQT_SIPDIR= ${PREFIX}/${_SIPDIR_REL} Therefore, py-sip got a very mangled PYQT_SIPDIR value passed to its configure script. Big thanks to Loïc for figuring out the issue :) PR: 223409 Submitted by: Loïc Bartoletti <lbartoletti@tuxfamily.org> Modified: head/Mk/Uses/pyqt.mk head/devel/py-sip/Makefile Modified: head/Mk/Uses/pyqt.mk ============================================================================== --- head/Mk/Uses/pyqt.mk Sun Nov 24 08:14:51 2019 (r518301) +++ head/Mk/Uses/pyqt.mk Sun Nov 24 08:39:30 2019 (r518302) @@ -217,7 +217,7 @@ _QMLDIR_REL= ${QT_QMLDIR_REL}/${_VERSION_SUBDIR_REL} PYQT_APIDIR= ${PREFIX}/${_APIDIR_REL} PYQT_DOCDIR= ${PREFIX}/${_DOCDIR_REL} PYQT_EXAMPLEDIR= ${PREFIX}/${_EXAMPLEDIR_REL} -PYQT_SIPDIR= ${PREFIX}/${_SIPDIR_REL} +PYQT_SIPDIR?= ${PREFIX}/${_SIPDIR_REL} PYQT_DESIGNERDIR= ${PREFIX}/${_DESIGNERDIR_REL} PYQT_QMLDIR= ${PREFIX}/${_QMLDIR_REL} Modified: head/devel/py-sip/Makefile ============================================================================== --- head/devel/py-sip/Makefile Sun Nov 24 08:14:51 2019 (r518301) +++ head/devel/py-sip/Makefile Sun Nov 24 08:39:30 2019 (r518302) @@ -36,6 +36,8 @@ CONFIGURE_WRKSRC= ${WRKSRC}/default BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} +PYQT_SIPDIR= ${LOCALBASE}/share/PyQt5/${PYTHON_VER}/sip + do-configure: # The default sip 'flavor' ${MKDIR} ${CONFIGURE_WRKSRC} && \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911240839.xAO8dVuU012040>