Date: Mon, 12 Aug 2013 17:56:41 +0000 (UTC) From: David Naylor <dbn@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324639 - in head/lang: pypy pypy-devel pypy3-devel Message-ID: <201308121756.r7CHufHJ006979@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbn Date: Mon Aug 12 17:56:40 2013 New Revision: 324639 URL: http://svnweb.freebsd.org/changeset/ports/324639 Log: Fix the pypy ports. Be more aggresive in cleaning up temporary directories that pypy leaves behind in the copied directories (files and directories in __pycache__). Only .so and .pyc should be left behind in those __pycache__ directories and no subdirectories. Also remove the manual requirement for building lang/pypy. Redports successfully built lang/pypy3-devel (with leftovers) in 19 hours. Reported by: Redports Modified: head/lang/pypy-devel/Makefile head/lang/pypy/Makefile head/lang/pypy3-devel/Makefile Modified: head/lang/pypy-devel/Makefile ============================================================================== --- head/lang/pypy-devel/Makefile Mon Aug 12 17:42:24 2013 (r324638) +++ head/lang/pypy-devel/Makefile Mon Aug 12 17:56:40 2013 (r324639) @@ -4,7 +4,7 @@ PORTNAME= pypy DISTVERSION= 2.2-alpha${DATE} CATEGORIES= lang python java -MASTER_SITES= https://bitbucket.org/pypy/pypy/get/ +MASTER_SITES= https://bitbucket.org/pypy/pypy/get/ LOCAL/dbn/${PORTNAME} PKGNAMESUFFIX= -devel DISTNAME= ${COMMIT} DIST_SUBDIR= pypy @@ -266,7 +266,8 @@ post-build: -name '*.bak' -delete -or \ -name '*.c' -delete -or \ -name '*.o' -delete - ${FIND} ${WRKDIR}/${_path:C/.*://}/ -depth -type d -name tmp | \ + ${FIND} ${WRKDIR}/${_path:C/.*://}/ -name __pycache__ | \ + ${XARGS} -n1 -I {} ${FIND} {} -depth 1 -type d | \ ${XARGS} ${RM} -r .endfor Modified: head/lang/pypy/Makefile ============================================================================== --- head/lang/pypy/Makefile Mon Aug 12 17:42:24 2013 (r324638) +++ head/lang/pypy/Makefile Mon Aug 12 17:56:40 2013 (r324639) @@ -35,7 +35,6 @@ OPTIONS_SINGLE_PYINST= PYTHON PYPY PYPY_ OPTIONS_DEFAULT+= PYPY_MINMEM .endif -MANUAL_PACKAGE_BUILD= runaway process on pointyhat CONFLICTS_INSTALL= pypy-devel-[0-9]* ALL_TARGET= ${PYPY_NAMES} @@ -290,7 +289,9 @@ post-build: -name '*.bak' -delete -or \ -name '*.c' -delete -or \ -name '*.o' -delete - ${FIND} ${WRKSRC}/lib -depth -type d -name tmp | ${XARGS} ${RM} -r + ${FIND} ${WRKDIR}/${_path:C/.*://}/ -name __pycache__ | \ + ${XARGS} -n1 -I {} ${FIND} {} -depth 1 -type d | \ + ${XARGS} ${RM} -r ${MV} ${WRKSRC}/include ${WRKSRC}/include~ ${MKDIR} ${WRKSRC}/include ${MV} ${WRKSRC}/include~ ${WRKSRC}/${PYPY_INCLUDEDIR} Modified: head/lang/pypy3-devel/Makefile ============================================================================== --- head/lang/pypy3-devel/Makefile Mon Aug 12 17:42:24 2013 (r324638) +++ head/lang/pypy3-devel/Makefile Mon Aug 12 17:56:40 2013 (r324639) @@ -263,7 +263,8 @@ post-build: -name '*.bak' -delete -or \ -name '*.c' -delete -or \ -name '*.o' -delete - ${FIND} ${WRKDIR}/${_path:C/.*://}/ -depth -type d -name tmp | \ + ${FIND} ${WRKDIR}/${_path:C/.*://}/ -name __pycache__ | \ + ${XARGS} -n1 -I {} ${FIND} {} -depth 1 -type d | \ ${XARGS} ${RM} -r .endfor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308121756.r7CHufHJ006979>