Merge lp:~fboucault/unity-webapps-qml/crossbuild_fixes into lp:unity-webapps-qml

Proposed by Florian Boucault on 2016-07-05
Status: Merged
Approved by: Alexandre Abreu on 2016-07-12
Approved revision: 160
Merged at revision: 160
Proposed branch: lp:~fboucault/unity-webapps-qml/crossbuild_fixes
Merge into: lp:unity-webapps-qml
Diff against target: 42 lines (+11/-1)
3 files modified
common-project-config.pri (+6/-0)
debian/control (+1/-1)
debian/rules (+4/-0)
To merge this branch: bzr merge lp:~fboucault/unity-webapps-qml/crossbuild_fixes
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) 2016-07-05 Approve on 2016-07-08
PS Jenkins bot continuous-integration Pending
Review via email: mp+299202@code.launchpad.net

Commit message

Fixes for crossbuilding.

Description of the change

Fixes for crossbuilding.

To post a comment you must log in.
Alexandre Abreu (abreu-alexandre) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common-project-config.pri'
2--- common-project-config.pri 2013-07-09 19:02:23 +0000
3+++ common-project-config.pri 2016-07-05 18:03:33 +0000
4@@ -11,5 +11,11 @@
5 TOP_SRC_DIR = $$PWD
6 TOP_BUILD_DIR = $${TOP_SRC_DIR}/$${BUILD_DIR}
7
8+# appropriately select pkgconfig for cross compiling
9+PKG_CONFIG_ARCH = $$section(QMAKE_CC, -, 0, -2)
10+!isEmpty (PKG_CONFIG_ARCH) {
11+ PKG_CONFIG = $$PKG_CONFIG_ARCH-pkg-config
12+}
13+
14 include(coverage.pri)
15
16
17=== modified file 'debian/control'
18--- debian/control 2015-03-04 17:00:45 +0000
19+++ debian/control 2016-07-05 18:03:33 +0000
20@@ -12,7 +12,7 @@
21 libunity-action-qt1-dev,
22 libunity-dev,
23 pkg-config,
24- python (>= 2.7),
25+ python:any (>= 2.7),
26 python-setuptools,
27 qt5-default,
28 qt5-qmake,
29
30=== modified file 'debian/rules'
31--- debian/rules 2014-07-14 23:28:57 +0000
32+++ debian/rules 2016-07-05 18:03:33 +0000
33@@ -4,6 +4,10 @@
34 # Uncomment this to turn on verbose mode.
35 #export DH_VERBOSE=1
36
37+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
38+export QT_SELECT=qt5-$(DEB_BUILD_MULTIARCH)-$(DEB_HOST_MULTIARCH)
39+endif
40+
41 %:
42 dh $@ --with python2
43

Subscribers

People subscribed via source and target branches

to all changes: