diff options
| author | dbn <dbn@FreeBSD.org> | 2013-08-13 01:56:40 +0800 |
|---|---|---|
| committer | dbn <dbn@FreeBSD.org> | 2013-08-13 01:56:40 +0800 |
| commit | 0324cefb01014cffc557f47fa97c8710846347ae (patch) | |
| tree | dbab960f1b10c3d493d392e01632dcbf24fa31d3 | |
| parent | 7eec7d62b3b617e43e4e7c7731a740301ccb7691 (diff) | |
| download | freebsd-ports-gnome-0324cefb01014cffc557f47fa97c8710846347ae.tar.gz freebsd-ports-gnome-0324cefb01014cffc557f47fa97c8710846347ae.tar.zst freebsd-ports-gnome-0324cefb01014cffc557f47fa97c8710846347ae.zip | |
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
| -rw-r--r-- | lang/pypy-devel/Makefile | 5 | ||||
| -rw-r--r-- | lang/pypy/Makefile | 5 | ||||
| -rw-r--r-- | lang/pypy3-devel/Makefile | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/lang/pypy-devel/Makefile b/lang/pypy-devel/Makefile index be2fa730abe8..aea38173b51a 100644 --- a/lang/pypy-devel/Makefile +++ b/lang/pypy-devel/Makefile @@ -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 diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile index d8ff16db6ff8..a894408a2d04 100644 --- a/lang/pypy/Makefile +++ b/lang/pypy/Makefile @@ -35,7 +35,6 @@ OPTIONS_SINGLE_PYINST= PYTHON PYPY PYPY_MINMEM 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} diff --git a/lang/pypy3-devel/Makefile b/lang/pypy3-devel/Makefile index 53198a8b6c5b..4dc9739e6b1e 100644 --- a/lang/pypy3-devel/Makefile +++ b/lang/pypy3-devel/Makefile @@ -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 |