kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

devel/py-sip: doesn't honor sip_dir

Browse source 
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>
This commit is contained in:
Tobias C. Berner 2019-11-24 08:39:30 +00:00
parent 8ab789d654
commit d0b8c1a99b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=518302
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mk/Uses/pyqt.mk
View file

@ -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}

2
devel/py-sip/Makefile
View file

@ -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} && \