Merge lp:~vanvugt/mir/fix-1510778 into lp:mir
Status: | Merged |
---|---|
Approved by: | Alexandros Frantzis |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3075 |
Proposed branch: | lp:~vanvugt/mir/fix-1510778 |
Merge into: | lp:mir |
Diff against target: |
186 lines (+77/-78) 3 files modified
tests/integration-tests/graphics/mesa/CMakeLists.txt (+75/-71) tests/unit-tests/input/CMakeLists.txt (+1/-1) tools/setup-partial-armhf-chroot.sh (+1/-6) |
To merge this branch: | bzr merge lp:~vanvugt/mir/fix-1510778 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexandros Frantzis (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Andreas Pokorny (community) | Approve | ||
Review via email: mp+275950@code.launchpad.net |
Commit message
Restore support for arm64 (and other architectures) cross compilation
(LP: #1510778). It was introduced and worked fine in r2907 but got
broken in r2914 and further in r2955. So although we announced it as
part of Mir 0.16.0, it was already broken prior to release.
Description of the change
Turns out it only ever worked fully for 2 days in September...
r2907: 2015-09-08: Added generic cross compilation support for
r2914: 2015-09-10: setup-partial-
r2955: 2015-09-22: CMake files got broken also and cross compilation
Prerequisites on your build machine (for example arm64):
Targeting vivid:
sudo apt-get install g++-4.9-
Otherwise:
sudo apt-get install g++-aarch64-
Modify the package names for other architectures...
PASSED: Continuous integration, rev:3059 jenkins. qa.ubuntu. com/job/ mir-ci/ 5419/ jenkins. qa.ubuntu. com/job/ mir-android- vivid-i386- build/4667 jenkins. qa.ubuntu. com/job/ mir-clang- vivid-amd64- build/3574 jenkins. qa.ubuntu. com/job/ mir-mediumtests -vivid- touch/4609 jenkins. qa.ubuntu. com/job/ mir-mediumtests -wily-touch/ 567/console jenkins. qa.ubuntu. com/job/ mir-wily- amd64-ci/ 1573 jenkins. qa.ubuntu. com/job/ mir-wily- amd64-ci/ 1573/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-wily- i386-ci/ 567 jenkins. qa.ubuntu. com/job/ mir-wily- i386-ci/ 567/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 4610 jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 4610/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -runner- touch/7230 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 24633 jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- wily-armhf/ 568/console
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- ci/5419/ rebuild
http://