diff options
| author | leot <leot@pkgsrc.org> | 2018-07-08 12:22:56 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2018-07-08 12:22:56 +0000 |
| commit | 3ba340ce27fb19ef61b062e98ba26a5318945e11 (patch) | |
| tree | ba27c4d8eead91b186d677e9a0fd83af137ee507 /net/py-google-cloud-sdk | |
| parent | 788575068df336a490ca232f9eccbe087f48ef2d (diff) | |
| download | pkgsrc-3ba340ce27fb19ef61b062e98ba26a5318945e11.tar.gz | |
py-google-cloud-sdk: Choose a safe fallback for Python interpreter
The logic to find a Python executable can be summarized as:
- CLOUDSDK_PYTHON environment variable defined:
+ If it matches `*python2*', use it
- Otherwise:
+ Try `python2'
+ Fallback to `python'
Substitute the latter fallback to ${PYTHONBIN} in order to have a
safe choice.
Should fix PR pkg/52122 reported by <jklos>.
This patch is based on the one proposed by <maya> (but restricted
to CLOUDSDK_PYTHON lines and the fallback `python').
Bump PKGREVISION.
Diffstat (limited to 'net/py-google-cloud-sdk')
| -rw-r--r-- | net/py-google-cloud-sdk/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/net/py-google-cloud-sdk/Makefile b/net/py-google-cloud-sdk/Makefile index ed34070a751..98240e1ac9f 100644 --- a/net/py-google-cloud-sdk/Makefile +++ b/net/py-google-cloud-sdk/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2016/04/02 08:26:49 jperkin Exp $ +# $NetBSD: Makefile,v 1.4 2018/07/08 12:22:56 leot Exp $ GCLOUDVER= 96.0.0 DISTNAME= google-cloud-sdk-${GCLOUDVER}-linux-x86 PKGNAME= ${PYPKGPREFIX}-google-cloud-sdk-${GCLOUDVER} +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/ @@ -23,6 +24,13 @@ REPLACE_PYTHON+= bin/bootstrapping/* PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} +SUBST_CLASSES+= python +SUBST_STAGE.python= pre-configure +SUBST_MESSAGE.python= Replacing hard coded python executable name +SUBST_FILES.python= lib/googlecloudsdk/core/* +SUBST_FILES.python+= bin/* +SUBST_SED.python= -e "/CLOUDSDK_PYTHON=/ s,python$$,${PYTHONBIN}," + INSTALLATION_DIRS= ${PKGBASE} do-install: |