pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/python Rectify fixup-python-writeable-source by p...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f75ab59e084e
branches:  trunk
changeset: 347728:f75ab59e084e
user:      richard <richard%pkgsrc.org@localhost>
date:      Sat May 28 11:23:46 2016 +0000

description:
Rectify fixup-python-writeable-source by putting egg-infodir related fixup
in egg.mk and simply forcing CHECK_PERMS_AUTOFIX=yes in extensions.mk

diffstat:

 lang/python/egg.mk       |  9 ++++++++-
 lang/python/extension.mk |  8 ++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diffs (43 lines):

diff -r f5d42d75c0e7 -r f75ab59e084e lang/python/egg.mk
--- a/lang/python/egg.mk        Sat May 28 11:06:03 2016 +0000
+++ b/lang/python/egg.mk        Sat May 28 11:23:46 2016 +0000
@@ -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 @@
 
 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 -r f5d42d75c0e7 -r f75ab59e084e lang/python/extension.mk
--- a/lang/python/extension.mk  Sat May 28 11:06:03 2016 +0000
+++ b/lang/python/extension.mk  Sat May 28 11:23:46 2016 +0000
@@ -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 @@
 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} \



Home | Main Index | Thread Index | Old Index