aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2023-07-17 20:16:46 +0000
committerGlen Barber <gjb@FreeBSD.org>2023-07-17 20:16:46 +0000
commitb24c35b326dbd355070335e63d02e7c29ee58bf0 (patch)
tree9022fa33431ab7580eab5ac6cf1621114797eae8
parent4b426cf3a46a429474e2a138d3360acc23411563 (diff)
downloadsrc-b24c35b326dbd355070335e63d02e7c29ee58bf0.tar.gz
src-b24c35b326dbd355070335e63d02e7c29ee58bf0.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 MFC after: 3 days MFC with: 510fd83138001b0a6e45b3fa6a7249377f806171 MFC with: cd8cad0ef5cd534dc7ae1dd9a470cac2057ed957 MFC with: 0ed426276fd52e917506ab87c05a61c6641ae298 Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd
-rw-r--r--release/Makefile.gce6
1 files changed, 2 insertions, 4 deletions
diff --git a/release/Makefile.gce b/release/Makefile.gce
index ff364c9287c5..17f4974b1c53 100644
--- a/release/Makefile.gce
+++ b/release/Makefile.gce
@@ -46,13 +46,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