Skip to content

Commit

Permalink
release: adjust lang/python* dependencies for GCE
Browse files Browse the repository at this point in the history
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:	510fd83
MFC with:	cd8cad0
MFC with:	0ed4262
Sponsored by:	GoFundMe https://www.gofundme.com/f/gjbbsd
  • Loading branch information
Glen Barber authored and Glen Barber committed Jul 17, 2023
1 parent 4b426cf commit b24c35b
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions release/Makefile.gce
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit b24c35b

Please sign in to comment.