Source-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/python python/extension.mk: Fix print-PLIST targe...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6defe07bd05a
branches:  trunk
changeset: 434070:6defe07bd05a
user:      leot <leot%pkgsrc.org@localhost>
date:      Wed Jun 10 16:11:07 2020 +0000

description:
python/extension.mk: Fix print-PLIST target to generate properly sorted PLISTs

Use EARLY_PRINT_PLIST_AWK instead of PRINT_PLIST_AWK so all the transformations
are done before the file/directory lists generated as part of print-PLIST are
sorted.

Discussed on tech-pkg@:

 <https://mail-index.NetBSD.org/tech-pkg/2020/05/27/msg023249.html>

diffstat:

 lang/python/extension.mk |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (24 lines):

diff -r e04a1d85ec89 -r 6defe07bd05a lang/python/extension.mk
--- a/lang/python/extension.mk  Wed Jun 10 16:08:31 2020 +0000
+++ b/lang/python/extension.mk  Wed Jun 10 16:11:07 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.56 2019/05/02 22:06:15 wiz Exp $
+# $NetBSD: extension.mk,v 1.57 2020/06/10 16:11:07 leot Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -74,10 +74,10 @@
 .if empty(_PYTHON_VERSION:M2?)
 PLIST_AWK+=            -f ${PKGSRCDIR}/lang/python/plist-python.awk
 PLIST_AWK_ENV+=                PYVERS="${PYVERSSUFFIX:S/.//}"
-PRINT_PLIST_AWK+=      /^[^@]/ && /[^\/]+\.py[co]$$/ {
-PRINT_PLIST_AWK+=      gsub(/__pycache__\//, "")
-PRINT_PLIST_AWK+=      gsub(/opt-1\.pyc$$/, "pyo")
-PRINT_PLIST_AWK+=      gsub(/\.cpython-${_PYTHON_VERSION}/, "")}
+EARLY_PRINT_PLIST_AWK+=        /^[^@]/ && /[^\/]+\.py[co]$$/ {
+EARLY_PRINT_PLIST_AWK+=        gsub(/__pycache__\//, "")
+EARLY_PRINT_PLIST_AWK+=        gsub(/opt-1\.pyc$$/, "pyo")
+EARLY_PRINT_PLIST_AWK+=        gsub(/\.cpython-${_PYTHON_VERSION}/, "")}
 .endif
 
 DISTUTILS_BUILDDIR_IN_TEST_ENV?=       no



Home | Main Index | Thread Index | Old Index