Merge branch 'master' into master+ZODB4-wc2

* master:
  golang: Build SWIG and include it into Go build environment

component/golang/buildout.cfg

@@ -5,6 +5,7 @@ extends =
   ../gcc/buildout.cfg
   ../git/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../swig/buildout.cfg
   ./buildout.hash.cfg
 
 parts = gowork go
@@ -21,6 +22,7 @@ make-targets= cd src && unset GOBIN && ./all.bash && cp -alf .. ${:location}
 # 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=${swig:location}/bin:%(PATH)s
   GOROOT_FINAL=${:location}
   ${:environment-extra}
 

component/golang/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [gowork-env.sh]
 filename = goenv.sh.in
-md5sum = f6d0fc24e3f08f27bc2bd85003ca5ec2
+md5sum = 67a211c786a2351867c3c38f675370f7

component/golang/goenv.sh.in

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