Mir

Merge lp:~alan-griffiths/mir/fix-cross-build into lp:mir

Proposed by Alan Griffiths on 2017-10-16
Status: Merged
Approved by: Brandon Schaefer on 2017-10-16
Approved revision: 4291
Merged at revision: 4292
Proposed branch: lp:~alan-griffiths/mir/fix-cross-build
Merge into: lp:mir
Prerequisite: lp:~alan-griffiths/mir/fix-1723971
Diff against target: 12 lines (+5/-0)
1 file modified
examples/miral-kiosk/CMakeLists.txt (+5/-0)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-cross-build
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) 2017-10-16 Approve on 2017-10-16
Mir CI Bot continuous-integration Approve on 2017-10-16
Review via email: mp+332304@code.launchpad.net

Commit message

Fix weird link error encountered when using cross-build script

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4291
https://mir-jenkins.ubuntu.com/job/mir-ci/3733/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5126
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5364
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5351
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5351
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5351
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5170
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5170/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5170
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5170/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5170
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5170/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5170
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5170/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5170
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5170/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5170
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5170/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5170
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5170/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5170
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5170/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3733/rebuild

review: Approve (continuous-integration)
Brandon Schaefer (brandontschaefer) wrote :

Huh that is strange, but if it fixes it for you then im happy to +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/miral-kiosk/CMakeLists.txt'
2--- examples/miral-kiosk/CMakeLists.txt 2017-08-31 15:12:09 +0000
3+++ examples/miral-kiosk/CMakeLists.txt 2017-10-16 15:39:36 +0000
4@@ -10,3 +10,8 @@
5 )
6
7 target_link_libraries(miral-kiosk miral)
8+
9+# I'm not sure why this is needed in a chroot, but it's not worth finding out
10+if(DEFINED MIR_CHROOT)
11+ target_link_libraries(miral-kiosk EGL ${GLESv2_LIBRARIES})
12+endif()

Subscribers

People subscribed via source and target branches