View | Details | Raw Unified | Return to bug 223409 | Differences between
and this patch

Collapse All | Expand All

(-)devel/py-sip/Makefile (-3 / +5 lines)
Lines 18-24 Link Here
18
18
19
CONFIGURE_ARGS=	-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
19
CONFIGURE_ARGS=	-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
20
		-e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR} \
20
		-e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR} \
21
		--sipdir ${PYQT_SIPDIR} \
21
		--sipdir ${SIPDIR} \
22
		CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \
22
		CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \
23
		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
23
		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
24
		INCDIR="${LOCALBASE}/include" LIBDIR="${LOCALBASE}/lib"
24
		INCDIR="${LOCALBASE}/include" LIBDIR="${LOCALBASE}/lib"
Lines 36-51 Link Here
36
BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
36
BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
37
INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
37
INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
38
38
39
SIPDIR=	${LOCALBASE}/share/PyQt5/sip
40
39
do-configure:
41
do-configure:
40
	# The default sip 'flavor'
42
	# The default sip 'flavor'
41
	${MKDIR} ${CONFIGURE_WRKSRC} &&  \
43
	${MKDIR} ${CONFIGURE_WRKSRC} &&  \
42
		cd ${CONFIGURE_WRKSRC} && \
44
		cd ${CONFIGURE_WRKSRC} && \
43
		${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} && \
45
		${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sipdir ${SIPDIR} && \
44
		${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|'  ${CONFIGURE_WRKSRC}/sipconfig.py
46
		${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|'  ${CONFIGURE_WRKSRC}/sipconfig.py
45
	# The now needed version for 5.11 (which will be the default from 2019-03-16).
47
	# The now needed version for 5.11 (which will be the default from 2019-03-16).
46
	${MKDIR} ${WRKSRC}/sip_qt5 && \
48
	${MKDIR} ${WRKSRC}/sip_qt5 && \
47
		cd ${WRKSRC}/sip_qt5 && \
49
		cd ${WRKSRC}/sip_qt5 && \
48
		${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sip-module PyQt5.sip --no-tools  && \
50
		${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sipdir ${SIPDIR} --sip-module PyQt5.sip --no-tools  && \
49
		${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|'  ${WRKSRC}/sip_qt5/sipconfig.py
51
		${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|'  ${WRKSRC}/sip_qt5/sipconfig.py
50
52
51
post-build:
53
post-build:

Return to bug 223409