From owner-svn-ports-head@freebsd.org Sun Nov 24 08:39:31 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E05441A8B4B; Sun, 24 Nov 2019 08:39:31 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47LNrM5WXtz3HhZ; Sun, 24 Nov 2019 08:39:31 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9D068218C7; Sun, 24 Nov 2019 08:39:31 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAO8dVf0012041; Sun, 24 Nov 2019 08:39:31 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAO8dVuU012040; Sun, 24 Nov 2019 08:39:31 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201911240839.xAO8dVuU012040@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 24 Nov 2019 08:39:31 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head: Mk/Uses devel/py-sip X-SVN-Commit-Revision: 518302 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Nov 2019 08:39:31 -0000 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: 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 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} && \