Merge lp:~dobey/ubuntu-push/gccgo-workaround into lp:ubuntu-push/vivid-overlay

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 153
Merged at revision: 157
Proposed branch: lp:~dobey/ubuntu-push/gccgo-workaround
Merge into: lp:ubuntu-push/vivid-overlay
Diff against target: 40 lines (+21/-0)
1 file modified
debian/rules (+21/-0)
To merge this branch: bzr merge lp:~dobey/ubuntu-push/gccgo-workaround
Reviewer Review Type Date Requested Status
Samuele Pedroni Approve
Review via email: mp+274937@code.launchpad.net

Commit message

Fix build using gccgo.

Description of the change

The changes from doko to enable building on gccgo, in a branch.

To post a comment you must log in.
153. By dobey

Fix the arch list.

Revision history for this message
Samuele Pedroni (pedronis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2015-08-14 13:03:23 +0000
3+++ debian/rules 2015-10-19 19:02:23 +0000
4@@ -4,6 +4,23 @@
5 export DH_GOPKG := launchpad.net/ubuntu-push
6 export UBUNTU_PUSH_TEST_RESOURCES_ROOT := $(CURDIR)
7
8+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
9+
10+ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el))
11+ pkg_configs = ubuntuoneauth-2.0 libaccounts-glib click-0.4 ubuntu-app-launch-2 url-dispatcher-1 messaging-menu dbus-1 libnih libnih-dbus glib-2.0 gobject-2.0
12+ export CGO_CFLAGS := \
13+ $(shell $(foreach pkg, $(pkg_configs), pkg-config --cflags $(pkg); ))
14+ export CGO_CXXFLAGS := $(CGO_CFLAGS)
15+ export CGO_LDFLAGS := \
16+ $(shell $(foreach pkg, $(pkg_configs), pkg-config --libs $(pkg); ))
17+ $(warning setting CGO_CFLAGS = $(CGO_CFLAGS))
18+ $(warning setting CGO_CXXFLAGS = $(CGO_CXXFLAGS))
19+ $(warning setting CGO_LDFLAGS = $(CGO_LDFLAGS))
20+
21+ # some tests seem to hang
22+ DEB_BUILD_OPTIONS := nocheck $(DEB_BUILD_OPTIONS)
23+endif
24+
25 override_dh_auto_build:
26 dh_auto_build --buildsystem=golang
27 (cd signing-helper && cmake . && make)
28@@ -11,8 +28,12 @@
29 # overriding dh_auto_test because the http13client tests don't all pass on go < 1.3
30 # (should go away once we ship go 1.3)
31 override_dh_auto_test:
32+ifneq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
33+ @echo testsuite is disabled.
34+else
35 cd $$( find ./ -type d -regex '\./[^/]*/src/launchpad.net' -printf "%h\n" | head -n1) && \
36 env GOPATH=$$(cd ..; pwd) go test -v $$(env GOPATH=$$(cd ..; pwd) go list $(DH_GOPKG)/... | grep -v acceptance | grep -v http13client )
37+endif
38
39 override_dh_install:
40 dh_install -Xusr/bin/cmd --fail-missing

Subscribers

People subscribed via source and target branches

to all changes: