Attachment 183246 Details for Bug 219641 – Use PYTHON_VER instead PYTHON_VERSION. Duh...

[patch] Use PYTHON_VER instead PYTHON_VERSION. Duh...

pyqt.mk.patch (text/plain), 1.33 KB, created by Mikhail T. on 2017-06-05 23:01:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail T.

Created: 2017-06-05 23:01:43 UTC

Size: 1.33 KB

patch

obsolete

>Index: pyqt.mk
>===================================================================
>--- pyqt.mk	(revision 442617)
>+++ pyqt.mk	(working copy)
>@@ -219,6 +219,7 @@
> 		-d ${PYTHONPREFIX_SITELIBDIR} \
> 		-q ${QMAKE} \
> 		--confirm-license \
>+		--sip ${LOCALBASE}/bin/sip-${PYTHON_VER} \
> 		--sipdir ${SIPDIR}
> 
> # One of the things PyQt looks for to determine whether to build the Qt DBus
>Index: python.mk
>===================================================================
>--- python.mk	(revision 442617)
>+++ python.mk	(working copy)
>@@ -545,7 +545,9 @@
> _USES_stage+=	935:add-plist-python
> add-plist-python:
> 	@${AWK} '\
>-		/\.py[co]$$/ && !($$0 ~ "/" pc "/") {id = match($$0, /\/[^\/]+\.py[co]$$/); if (id != 0) {d = substr($$0, 1, RSTART - 1); dirs[d] = 1}; sub(/\.pyc$$/,  "." mt "&"); sub(/\.pyo$$/, "." mt "." pyo); sub(/[^\/]+\.py[co]$$/, pc "/&"); print; next} \
>+		/\.py[co]$$/ && !($$0 ~ "/" pc "/") {id = match($$0, /\/[^\/]+\.py[co]$$/); if (id != 0) {d = substr($$0, 1, RSTART - 1); dirs[d] = 1}; od = match($$0, /opt-1/);\
>+		if ( od != 0 ) sub(/\.opt-1\./, "." mt "&"); else \
>+		sub(/\.pyc$$/,  "." mt "&");  sub(/[^\/]+\.py[co]$$/, pc "/&"); print; next} \
> 		/^@dirrm / {d = substr($$0, 8); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
> 		/^@dirrmtry / {d = substr($$0, 11); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
> 		{print} \

Actions: View | Diff

Attachments on bug 219641: 183051 | 183052 | 183244 | 183245 | 183246 | 187619 | 187626