Pay Service

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

  1. cgo-flags
  2. Merge into trunk.15.04
Proposed by dobey
Status: Merged
Approved by: Charles Kerr
Approved revision: 177
Merged at revision: 52
Proposed branch: lp:~dobey/pay-service/cgo-flags
Merge into: lp:pay-service/15.04
Prerequisite: lp:~dobey/pay-service/build-parallel
Diff against target: 24 lines (+5/-2)
1 file modified
service-ng/CMakeLists.txt (+5/-2)
To merge this branch: bzr merge lp:~dobey/pay-service/cgo-flags
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+274563@code.launchpad.net

Commit message

Set CGO environment variables to enable compiling under gccgo.

To post a comment you must log in.
lp:~dobey/pay-service/cgo-flags updated
177. By dobey

Wrap GOPATH value in quotes too.

Revision history for this message
Charles Kerr (charlesk) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
lp:~dobey/pay-service/cgo-flags updated
178. By dobey

Don't quote the gopath as cmake quotes the quotes, breaking go build.

Revision history for this message
Charles Kerr (charlesk) wrote :

Re-approving for r178

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'service-ng/CMakeLists.txt'
2--- service-ng/CMakeLists.txt 2015-10-15 17:56:07 +0000
3+++ service-ng/CMakeLists.txt 2015-10-15 17:56:08 +0000
4@@ -2,8 +2,11 @@
5
6 set(SERVICE_NG_TARGET pay-service-2)
7
8+# Set environment for go
9+set(GO_ENV GOPATH=${CMAKE_CURRENT_SOURCE_DIR} CGO_CFLAGS="${SERVICE_DEPS_CFLAGS}" CGO_CXXFLAGS="${SERVICE_DEPS_CFLAGS}" CGO_LDFLAGS="${SERVICE_DEPS_LDFLAGS}")
10+
11 add_custom_target(${SERVICE_NG_TARGET} ALL
12- COMMAND GOPATH=${CMAKE_CURRENT_SOURCE_DIR} go build ${SERVICE_NG_TARGET}
13+ COMMAND ${GO_ENV} go build ${SERVICE_NG_TARGET}
14 )
15
16 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_NG_TARGET}
17@@ -17,7 +20,7 @@
18 endif()
19
20 add_custom_target(test-service-ng
21- COMMAND GOPATH=${CMAKE_CURRENT_SOURCE_DIR} dbus-test-runner -m 600 -t ${CMAKE_CURRENT_SOURCE_DIR}/test-service.sh -p ${SERVICE_NG_TARGET}/service -p ${TEST_TYPE}
22+ COMMAND ${GO_ENV} dbus-test-runner -m 600 -t ${CMAKE_CURRENT_SOURCE_DIR}/test-service.sh -p ${SERVICE_NG_TARGET}/service -p ${TEST_TYPE}
23 DEPENDS ${SERVICE_NG_TARGET}
24 )
25

Subscribers

People subscribed via source and target branches

to all changes: