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-20 01:31:52 +0000
commit3e94b6a238081a1178f2e6448cb9d91028784bf2 (patch)
tree1fd0029c64f94fbdd993f65ff74d435a8182e121
parentca7d3085f1f407df504ea7216c74526bef4727b4 (diff)
downloadsrc-3e94b6a238081a1178f2e6448cb9d91028784bf2.tar.gz
src-3e94b6a238081a1178f2e6448cb9d91028784bf2.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.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