wip

component/caddy/buildout.cfg

@@ -8,8 +8,6 @@ parts =
 [gowork]
 # Caddy 1.x+ uses go modules, for which gowork does not work yet
 golang  = ${golang1.12:location}
-gcc-bin-directory  = ${golang1.12:gcc-bin-directory}
-
 install =
 
 [gowork.goinstall]

component/defaults.cfg

@@ -4,6 +4,11 @@ extends =
   python3/buildout.cfg
 python = python
 
+# Unless a software release needs several versions of either Python or GCC
+# at the same time, the [pythonX.Y] & [gcc-X.Y] must not be referred directly,
+# even if a component works only with specific versions.
+# There may be exceptions in profiles that were written before this one.
+
 [python]
 recipe = slapos.recipe.build
 part = python2.7

component/golang/buildout.cfg

@@ -17,12 +17,9 @@ configure-command = :
 location = @@LOCATION@@
 make-binary =
 make-targets= cd src && ./all.bash && cp -alf .. ${:location}
-# gcc version to use
-gcc-bin-directory = ${gcc-8.2:location}/bin
 # some testdata files have an issue with slapos.extension.strip.
 post-install = ${findutils:location}/bin/find ${:location}/src -type d -name testdata -exec rm -rf {} \; || true
 environment =
-  PATH=${:gcc-bin-directory}:%(PATH)s
   GOROOT_FINAL=${:location}
   ${:environment-extra}
 
@@ -106,9 +103,6 @@ depends = ${gowork.goinstall:recipe}
 # go version used for the workspace (possible to override in applications)
 golang  = ${golang1.10:location}
 
-# gcc version must be compatible with go version selected
-gcc-bin-directory = ${golang1.10:gcc-bin-directory}
-
 # no special build flags by default
 buildflags =
 
@@ -127,7 +121,7 @@ recipe	= slapos.recipe.template
 url     = ${:_profile_base_location_}/goenv.sh.in
 output	= ${gowork:directory}/env.sh
 depends = ${gowork.mkdir:recipe}
-md5sum	= 7eaad1f9aabd3cfad554975098c5d4c3
+md5sum	= 6bcf96cf18ea68ce6e378ed8d49346a3
 
 [gowork.mkdir]
 # NOTE do not use slapos.cookbook:mkdirectory here - if anything in software (not instance)

component/golang/goenv.sh.in

@@ -3,7 +3,7 @@
 
 # ---- 8< ---- (buildout substitution here)
 # PATH so that go & friends work out of the box
-export PATH=${gowork:golang}/bin:${git:location}/bin:${pkgconfig:location}/bin:${buildout:bin-directory}:${gowork:gcc-bin-directory}:$PATH
+export PATH=${gowork:golang}/bin:${git:location}/bin:${pkgconfig:location}/bin:${buildout:bin-directory}:${gcc:prefix}/bin:$PATH
 X=${gowork:directory}
 
 export PKG_CONFIG_PATH=$(echo -n "${gowork:cpkgpath}" |tr '\n' ':'):$PKG_CONFIG_PATH

component/helloweb/buildout.cfg

@@ -26,7 +26,6 @@ install =
     lab.nexedi.com/nexedi/helloweb/go/...
 
 golang  = ${golang1.12:location}
-gcc-bin-directory  = ${golang1.12:gcc-bin-directory}
 
 # -*- go -*-
 [helloweb-go]

software/gitlab/software.cfg

@@ -232,7 +232,6 @@ command = bash -c ". ${gowork:env.sh} && CGO_CFLAGS=-I${:git2go}/include CGO_LDF
 
 [gowork]
 golang  = ${golang1.12:location}
-gcc-bin-directory = ${golang1.12:gcc-bin-directory}
 # gitlab.com/gitlab-org/gitlab-workhorse
 # gitlab.com/gitlab-org/gitlab-workhorse/cmd/gitlab-zip-cat
 # gitlab.com/gitlab-org/gitlab-workhorse/cmd/gitlab-zip-metadata

software/grafana/software.cfg

@@ -50,7 +50,6 @@ promtail-bin = ${:bin}/promtail
 
 # use recent go
 golang  = ${golang1.12:location}
-gcc-bin-directory  = ${golang1.12:gcc-bin-directory}
 
 [gowork.goinstall]
 command = :