CVS commit: pkgsrc/lang/python

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sun Apr  3 11:54:48 UTC 2022

Modified Files:
        pkgsrc/lang/python: egg.mk

Log Message:
python: Fix cross-build with pkg_resources.

setuptools must still be in TOOL_DEPENDS because we run it during the
build; for pkg_resources it must _also_ be in DEPENDS because the
built package needs it to run.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/lang/python/egg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python/egg.mk
diff -u pkgsrc/lang/python/egg.mk:1.36 pkgsrc/lang/python/egg.mk:1.37
--- pkgsrc/lang/python/egg.mk:1.36      Tue Feb  8 17:19:50 2022
+++ pkgsrc/lang/python/egg.mk   Sun Apr  3 11:54:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.36 2022/02/08 17:19:50 gutteridge Exp $
+# $NetBSD: egg.mk,v 1.37 2022/04/03 11:54:48 riastradh Exp $
 #
 # Common logic to handle Python Eggs
 #
@@ -55,9 +55,8 @@ SETUPTOOLS_PATH=../../devel/py-setuptool
 .  endif
 .  if "${USE_PKG_RESOURCES}" == "yes"
 DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:${SETUPTOOLS_PATH}
-.  else
-TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:${SETUPTOOLS_PATH}
 .  endif
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:${SETUPTOOLS_PATH}
 .endif
 
 INSTALLATION_DIRS+=    ${PYSITELIB}