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

Collapse All | Expand All

(-)b/devel/py-sip/Makefile (-5 / +14 lines)
Lines 15-25 COMMENT= Python to C and C++ bindings generator Link Here
15
15
16
USES=		python pyqt:sip
16
USES=		python pyqt:sip
17
USE_PYTHON=	concurrent py3kplist flavors
17
USE_PYTHON=	concurrent py3kplist flavors
18
USE_PYQT=	#
19
18
20
CONFIGURE_ARGS=	-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
19
CONFIGURE_ARGS=	-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
21
		-e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR} \
20
		-e ${PYTHONPREFIX_INCLUDEDIR} \
22
		--sipdir ${PYQT_SIPDIR} \
23
		CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \
21
		CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \
24
		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
22
		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
25
		INCDIR="${LOCALBASE}/include" LIBDIR="${LOCALBASE}/lib"
23
		INCDIR="${LOCALBASE}/include" LIBDIR="${LOCALBASE}/lib"
Lines 38-59 CONFIGURE_WRKSRC= ${WRKSRC}/default Link Here
38
BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
36
BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
39
INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
37
INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
40
38
39
# pyqt.mk does not know whether we uses Qt 4 or 5 in this port.
40
# Therefore the following line is not well-defined:
41
#   _VERSION_SUBDIR_REL=├→→→PyQt${_PYQT_VERSION}/${PYTHON_VER}
42
.for version in 4 5
43
_VERSION_SUBDIR_REL${version}=	share/PyQt${version}/${PYTHON_VER}/sip
44
SIPDIR${version}=	${PREFIX}/${_VERSION_SUBDIR_REL${version}}
45
.endfor
46
41
do-configure:
47
do-configure:
42
	# The default sip 'flavor'
48
	# The default sip 'flavor'
43
	${MKDIR} ${CONFIGURE_WRKSRC} &&  \
49
	${MKDIR} ${CONFIGURE_WRKSRC} &&  \
44
		cd ${CONFIGURE_WRKSRC} && \
50
		cd ${CONFIGURE_WRKSRC} && \
45
		${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} && \
51
		${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sipdir ${SIPDIR4} && \
46
		${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|'  ${CONFIGURE_WRKSRC}/sipconfig.py
52
		${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|'  ${CONFIGURE_WRKSRC}/sipconfig.py
47
	# The now needed version for 5.11 (which will be the default from 2019-03-16).
53
	# The now needed version for 5.11 (which will be the default from 2019-03-16).
48
	${MKDIR} ${WRKSRC}/sip_qt5 && \
54
	${MKDIR} ${WRKSRC}/sip_qt5 && \
49
		cd ${WRKSRC}/sip_qt5 && \
55
		cd ${WRKSRC}/sip_qt5 && \
50
		${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sip-module PyQt5.sip --no-tools  && \
56
		${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sipdir ${SIPDIR5} --sip-module PyQt5.sip --no-tools  && \
51
		${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|'  ${WRKSRC}/sip_qt5/sipconfig.py
57
		${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|'  ${WRKSRC}/sip_qt5/sipconfig.py
52
58
53
post-build:
59
post-build:
54
	cd ${WRKSRC}/sip_qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
60
	cd ${WRKSRC}/sip_qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
55
61
56
post-install:
62
post-install:
63
	# The default version is PyQt4, but we need PyQt5 by default
64
	${REINPLACE_CMD} -e 's/PyQt4/PyQt5/g' ${STAGEDIR}${PYTHON_SITELIBDIR}/sipconfig.py
65
57
	${MKDIR} ${STAGEDIR}${DOCSDIR} && cd ${WRKSRC}/doc/html && \
66
	${MKDIR} ${STAGEDIR}${DOCSDIR} && cd ${WRKSRC}/doc/html && \
58
		${COPYTREE_SHARE} \. ${STAGEDIR}${DOCSDIR}
67
		${COPYTREE_SHARE} \. ${STAGEDIR}${DOCSDIR}
59
	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
68
	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \

Return to bug 223409