diff options
| author | leot <leot@pkgsrc.org> | 2020-06-10 16:11:07 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2020-06-10 16:11:07 +0000 |
| commit | 631991b281cd3cfcd99ebc6f979dbf211c72db8d (patch) | |
| tree | 639bc1538d86edfe6e34d0ee5b580ce4638bba25 | |
| parent | 402a48e273c00e3d24a204a489eb099478060002 (diff) | |
| download | pkgsrc-631991b281cd3cfcd99ebc6f979dbf211c72db8d.tar.gz | |
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>
| -rw-r--r-- | lang/python/extension.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lang/python/extension.mk b/lang/python/extension.mk index 473c7e2a54a..1b877f6f868 100644 --- a/lang/python/extension.mk +++ b/lang/python/extension.mk @@ -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 @@ FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} .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 |