Merge lp:~dobey/pay-service/more-cgo-flags-gccgo into lp:pay-service/15.04

[dobey]

Need the threading lib for gccgo.
Need the path to the g++ lib directory for linking with gccgo.
Need to disable coverage reporting under gccgo.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:178
http://jenkins.qa.ubuntu.com/job/pay-service-15.04-ci/80/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-service-15.04-vivid-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-service-15.04-vivid-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/pay-service-15.04-vivid-armhf-ci/80/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-service-15.04-ci/80/rebuild

review: Approve (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

LGTM.

review: Approve

=== modified file 'service-ng/CMakeLists.txt'
--- service-ng/CMakeLists.txt	2015-10-15 19:18:50 +0000
+++ service-ng/CMakeLists.txt	2015-10-15 19:18:50 +0000
@@ -3,7 +3,18 @@
 set(SERVICE_NG_TARGET pay-service-2)
 
 # Set environment for go
-set(GO_ENV GOPATH=${CMAKE_CURRENT_SOURCE_DIR} CGO_CFLAGS="${SERVICE_DEPS_CFLAGS}" CGO_CXXFLAGS="${SERVICE_DEPS_CFLAGS}" CGO_LDFLAGS="${SERVICE_DEPS_LDFLAGS}")
+find_package(Threads)
+execute_process(
+  COMMAND ${CMAKE_CXX_COMPILER} --print-file-name libstdc++.so
+  OUTPUT_VARIABLE LIBSTDC_PATH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+execute_process(
+  COMMAND dirname ${LIBSTDC_PATH}
+  OUTPUT_VARIABLE GCC_LIB_DIR
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+set(GO_ENV CXX=${CMAKE_CXX_COMPILER} GOPATH=${CMAKE_CURRENT_SOURCE_DIR} CGO_CFLAGS="${SERVICE_DEPS_CFLAGS}" CGO_CXXFLAGS="${SERVICE_DEPS_CFLAGS}" CGO_LDFLAGS="${SERVICE_DEPS_LDFLAGS};-L${GCC_LIB_DIR};${CMAKE_THREAD_LIBS_INIT}")
 
 add_custom_target(${SERVICE_NG_TARGET} ALL
   COMMAND ${GO_ENV} go build ${SERVICE_NG_TARGET}

=== modified file 'service-ng/test-service.sh'
--- service-ng/test-service.sh	2015-10-15 19:18:50 +0000
+++ service-ng/test-service.sh	2015-10-15 19:18:50 +0000
@@ -18,7 +18,7 @@
 set -e
 
 GO_TEST_OPTIONS=""
-if [ "x${2}" = "xcoverage" ]; then
+if [ "x${2}" = "xcoverage" -a -z "`go version|grep gccgo`" ]; then
     GO_TEST_OPTIONS="-coverprofile=go.cover"
 fi