Date: Sun, 19 Jan 2014 17:18:19 GMT From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/185884: [patch] Miscellaneous ports fixes for python 3 Message-ID: <201401191718.s0JHIJtt041496@oldred.freebsd.org> Resent-Message-ID: <201401191720.s0JHK0KK041045@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185884
>Category: ports
>Synopsis: [patch] Miscellaneous ports fixes for python 3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 19 17:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Nathan Whitehorn
>Release: 11
>Organization:
>Environment:
FreeBSD comporellon.tachypleus.net 11.0-CURRENT FreeBSD 11.0-CURRENT #144 r259416:259418M: Sun Dec 15 11:19:30 CST 2013 root@comporellon.tachypleus.net:/usr/obj/usr/src/sys/COMPORELLON amd64
>Description:
The attached patch fixes some miscellaneous issues I experienced with DEFAULT_VERSIONS=python=3.3 set in /etc/make.conf, mostly by specifying that python 2 is required. The devel/py-qt4-core bit fixes some logic to avoid byte-compiling code for the wrong python version by removing the directory not applicable to the package rather than unconditionally removing the python 3 one.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: devel/llvm33/Makefile
===================================================================
--- devel/llvm33/Makefile (revision 340317)
+++ devel/llvm33/Makefile (working copy)
@@ -149,6 +149,8 @@
CONFIGURE_ARGS+= --with-optimize-option=-O2
.endif
+CONFIGURE_ARGS+= --with-python=/usr/local/bin/python2
+
post-patch:
${REINPLACE_CMD} -e 's|${PORTVERSION}svn|${PORTVERSION}|g' \
${WRKSRC}/configure
Index: devel/py-qt4-core/Makefile
===================================================================
--- devel/py-qt4-core/Makefile (revision 340317)
+++ devel/py-qt4-core/Makefile (working copy)
@@ -53,8 +53,16 @@
ARGS+= --debug --trace
.endif
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_MAJOR_VER} != "3"
+BAD_UIC_PORT_DIR= port_v3
+.else
+BAD_UIC_PORT_DIR= port_v2
+.endif
+
post-patch:
- ${RM} -rf ${WRKSRC}/pyuic/uic/port_v3
+ ${RM} -rf ${WRKSRC}/pyuic/uic/${BAD_UIC_PORT_DIR}
do-configure:
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
@@ -75,4 +83,4 @@
${PYTHON_CMD} -O ${PYTHON_LIBDIR}/py_compile.py\
`ls *.py */*.py */*/*.py`
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: x11/libxcb/Makefile
===================================================================
--- x11/libxcb/Makefile (revision 340317)
+++ x11/libxcb/Makefile (working copy)
@@ -24,7 +24,7 @@
USE_GNOME= libxslt:build
USE_LDCONFIG= yes
USE_XORG= xau xdmcp
-USE_PYTHON_BUILD= yes
+USE_PYTHON_BUILD= 2
GNU_CONFIGURE= yes
.for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
Index: x11/xcb-proto/Makefile
===================================================================
--- x11/xcb-proto/Makefile (revision 340317)
+++ x11/xcb-proto/Makefile (working copy)
@@ -13,7 +13,7 @@
USE_BZIP2= yes
USES= pathfix
-USE_PYTHON= yes
+USE_PYTHON= 2
GNU_CONFIGURE= yes
DATADIR= ${PREFIX}/share/xcb
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401191718.s0JHIJtt041496>