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

[Gerry Boland]

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

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

[lp:~gerboland/qtmir/gcc4.9-crosscompile]

303. By Gerry Boland on 2015-01-13

typo

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:303
http://jenkins.qa.ubuntu.com/job/qtmir-ci/194/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/45/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/194/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

 * 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

=== modified file 'debian/control'
--- debian/control	2015-01-06 17:28:52 +0000
+++ debian/control	2015-01-13 15:23:21 +0000
@@ -7,8 +7,10 @@
                debhelper (>= 9),
 # We rely on C++11 features, and to prevent from ABI breaks
 # in libstdc++ causing us issues, we explicitly select a G++
-# version.
-               g++-4.9,
+# version. To allow cross-compiling to work, we also must
+# append :native to g++-4.9 so we don't try to run armhf g++
+# on an x86 CPU for example, when cross-compiling.
+               g++-4.9:native,
                google-mock (>= 1.6.0+svn437),
                libboost-system-dev,
                libfontconfig1-dev,