Merge lp:~gerboland/qtmir/gcc4.9-crosscompile into lp:qtmir

Proposed by Gerry Boland on 2015-01-13
Status: Merged
Approved by: Michał Sawicz on 2015-01-13
Approved revision: 303
Merged at revision: 302
Proposed branch: lp:~gerboland/qtmir/gcc4.9-crosscompile
Merge into: lp:qtmir
Diff against target: 16 lines (+4/-2)
1 file modified
debian/control (+4/-2)
To merge this branch: bzr merge lp:~gerboland/qtmir/gcc4.9-crosscompile
Reviewer Review Type Date Requested Status
Michał Sawicz 2015-01-13 Approve on 2015-01-13
PS Jenkins bot (community) continuous-integration Needs Fixing on 2015-01-13
Review via email: mp+246316@code.launchpad.net

Commit message

Depend on :native version of g++ to allow cross-compiling to work.

Description of the change

Depend on :native version of g++ to allow cross-compiling to work.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
N - is build specifier change only
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N - small specifier change only

To post a comment you must log in.
303. By Gerry Boland on 2015-01-13

typo

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Michał Sawicz (saviq) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
CI can't deal with :native, needs a hook

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-01-06 17:28:52 +0000
3+++ debian/control 2015-01-13 15:23:21 +0000
4@@ -7,8 +7,10 @@
5 debhelper (>= 9),
6 # We rely on C++11 features, and to prevent from ABI breaks
7 # in libstdc++ causing us issues, we explicitly select a G++
8-# version.
9- g++-4.9,
10+# version. To allow cross-compiling to work, we also must
11+# append :native to g++-4.9 so we don't try to run armhf g++
12+# on an x86 CPU for example, when cross-compiling.
13+ g++-4.9:native,
14 google-mock (>= 1.6.0+svn437),
15 libboost-system-dev,
16 libfontconfig1-dev,

Subscribers

People subscribed via source and target branches