Merge lp:~dobey/ubuntu-push/s390x-gccgo into lp:ubuntu-push/automatic

Proposed by dobey on 2016-01-14
Status: Merged
Approved by: dobey on 2016-01-14
Approved revision: 422
Merged at revision: 422
Proposed branch: lp:~dobey/ubuntu-push/s390x-gccgo
Merge into: lp:ubuntu-push/automatic
Diff against target: 12 lines (+1/-1)
1 file modified
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~dobey/ubuntu-push/s390x-gccgo
Reviewer Review Type Date Requested Status
Michael Nelson (community) 2016-01-14 Approve on 2016-01-14
Review via email: mp+282667@code.launchpad.net

Commit message

Handle gccg on s390x.

To post a comment you must log in.
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-11-20 18:02:47 +0000
3+++ debian/rules 2016-01-14 21:01:01 +0000
4@@ -6,7 +6,7 @@
5
6 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
7
8-ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el))
9+ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el s390x))
10 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
11 export CGO_CFLAGS := \
12 $(shell $(foreach pkg, $(pkg_configs), pkg-config --cflags $(pkg); ))

Subscribers

People subscribed via source and target branches

to all changes: