diff options
| author | richard <richard@pkgsrc.org> | 2016-05-28 11:23:46 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2016-05-28 11:23:46 +0000 |
| commit | 8626f7f934a03c0f6be29b52d2a1dbbc00ea0bcd (patch) | |
| tree | 526dd89a0584e7dbb890d663fbad58114c4ee3d9 | |
| parent | 977599cf4c706526dfaff34c8c9f0b9cf0d0b58f (diff) | |
| download | pkgsrc-8626f7f934a03c0f6be29b52d2a1dbbc00ea0bcd.tar.gz | |
Rectify fixup-python-writeable-source by putting egg-infodir related fixup
in egg.mk and simply forcing CHECK_PERMS_AUTOFIX=yes in extensions.mk
| -rw-r--r-- | lang/python/egg.mk | 9 | ||||
| -rw-r--r-- | lang/python/extension.mk | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/lang/python/egg.mk b/lang/python/egg.mk index a93ae10a197..d4331a03ae5 100644 --- a/lang/python/egg.mk +++ b/lang/python/egg.mk @@ -1,4 +1,4 @@ -# $NetBSD: egg.mk,v 1.21 2016/04/10 16:39:28 joerg Exp $ +# $NetBSD: egg.mk,v 1.22 2016/05/28 11:23:46 richard Exp $ # # Common logic to handle Python Eggs # @@ -39,4 +39,11 @@ DEPENDS+= ${PYPKGPREFIX}-setuptools>=0.8:../../devel/py-setuptools INSTALLATION_DIRS+= ${PYSITELIB} +privileged-install-hook: fixup-egg-info +.PHONY: fixup-egg-info +fixup-egg-info: # ensure egg-info directory contents are always 644 + ${TEST} -d "${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_INFODIR}" && \ + ${FIND} ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_INFODIR} -type f \ + -exec ${CHMOD} ${SHAREMODE} '{}' + + .include "../../lang/python/extension.mk" diff --git a/lang/python/extension.mk b/lang/python/extension.mk index 6c4207883fb..046b17f89b9 100644 --- a/lang/python/extension.mk +++ b/lang/python/extension.mk @@ -1,4 +1,4 @@ -# $NetBSD: extension.mk,v 1.45 2016/05/21 05:22:40 richard Exp $ +# $NetBSD: extension.mk,v 1.46 2016/05/28 11:23:46 richard Exp $ .include "../../lang/python/pyversion.mk" @@ -28,11 +28,7 @@ PYSETUPTESTTARGET?= test PYSETUPTESTARGS?= #empty PYSETUPSUBDIR?= #empty -post-install: fixup-python-writeable-source -.PHONY: fixup-python-writeable-source -fixup-python-writeable-source: - ${FIND} ${DESTDIR} -type f \( -perm -g+w -o -perm -o+w \) \ - -exec ${CHMOD} go-w '{}' + +CHECK_PERMS_AUTOFIX= yes # fixup most mode related warnings/errors do-build: (cd ${WRKSRC}/${PYSETUPSUBDIR} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} \ |