Attachment 208905 Details for Bug 223409 – fix sipconfig. Simplest version with --sipdir and an explicit variable

[patch] fix sipconfig. Simplest version with --sipdir and an explicit variable

py-sip.diff (text/plain), 1.48 KB, created by Loïc Bartoletti on 2019-11-06 05:16:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2019-11-06 05:16:56 UTC

Size: 1.48 KB

patch

obsolete

>Index: devel/py-sip/Makefile
>===================================================================
>--- devel/py-sip/Makefile	(revision 516831)
>+++ devel/py-sip/Makefile	(working copy)
>@@ -18,7 +18,7 @@
> 
> CONFIGURE_ARGS=	-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
> 		-e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR} \
>-		--sipdir ${PYQT_SIPDIR} \
>+		--sipdir ${SIPDIR} \
> 		CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \
> 		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
> 		INCDIR="${LOCALBASE}/include" LIBDIR="${LOCALBASE}/lib"
>@@ -36,16 +36,18 @@
> BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
> INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
> 
>+SIPDIR=	${LOCALBASE}/share/PyQt5/${PYTHON_VER}/sip
>+
> do-configure:
> 	# The default sip 'flavor'
> 	${MKDIR} ${CONFIGURE_WRKSRC} &&  \
> 		cd ${CONFIGURE_WRKSRC} && \
>-		${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} && \
>+		${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sipdir ${SIPDIR} && \
> 		${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|'  ${CONFIGURE_WRKSRC}/sipconfig.py
> 	# The now needed version for 5.11 (which will be the default from 2019-03-16).
> 	${MKDIR} ${WRKSRC}/sip_qt5 && \
> 		cd ${WRKSRC}/sip_qt5 && \
>-		${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sip-module PyQt5.sip --no-tools  && \
>+		${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sipdir ${SIPDIR} --sip-module PyQt5.sip --no-tools  && \
> 		${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|'  ${WRKSRC}/sip_qt5/sipconfig.py
> 
> post-build:

Actions: View | Diff

Attachments on bug 223409: 201000 | 208888 | 208889 | 208891 | 208894 | 208905 | 209329