git: 58bc084de5a2 - stable/12 - release: adjust lang/python* dependencies for GCE
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 20 Jul 2023 01:36:44 UTC
The branch stable/12 has been updated by gjb:
URL: https://cgit.FreeBSD.org/src/commit/?id=58bc084de5a2155f34ffbd5fd3812fb432e1a72e
commit 58bc084de5a2155f34ffbd5fd3812fb432e1a72e
Author: Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2023-07-17 20:16:46 +0000
Commit: Glen Barber <gjb@FreeBSD.org>
CommitDate: 2023-07-20 01:36:06 +0000
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)
---
release/Makefile.gce | 6 ++----
1 file 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