diff options
author | Glen Barber <gjb@FreeBSD.org> | 2023-07-17 20:16:46 +0000 |
---|---|---|
committer | Glen Barber <gjb@FreeBSD.org> | 2023-07-20 01:36:06 +0000 |
commit | 58bc084de5a2155f34ffbd5fd3812fb432e1a72e (patch) | |
tree | 11df82fd2e71f96ca194e4e23c9c9450a019dc05 | |
parent | ad6773477b566bb901a4fca31bcb004dc11b319f (diff) | |
download | src-58bc084de5a2155f34ffbd5fd3812fb432e1a72e.tar.gz src-58bc084de5a2155f34ffbd5fd3812fb432e1a72e.zip |
release: adjust lang/python* dependencies for GCE
The lang/python3 port had failed to properly install because
it did in fact already exist and FORCE_PKG_REGISTER was not
set. So, behaviorally everything here was correct. However,
installing lang/python3 is in fact not correct and not needed,
so only install the lang/python port to provide symbolic links.
PR: 272354
Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd
Sponsored by: PayPal https://paypal.me/gjbbsd
(cherry picked from commit b24c35b326dbd355070335e63d02e7c29ee58bf0)
-rw-r--r-- | release/Makefile.gce | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/release/Makefile.gce b/release/Makefile.gce index 2eb6c8f46c29..4a574e6e26ac 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -47,13 +47,11 @@ gce-check-depends: . if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf . endif - env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk - env ASSUME_ALWAYS_YES=yes pkg install -y lang/python lang/python3 \ - net/google-cloud-sdk + env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk \ + lang/python . else env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python BATCH=1 all install clean - env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python3 BATCH=1 all install clean . endif .endif |