Mir

Merge lp:~vanvugt/mir/workaround-1674201 into lp:mir

  1. workaround-1674201
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Merged at revision: 4098
Proposed branch: lp:~vanvugt/mir/workaround-1674201
Merge into: lp:mir
Prerequisite: lp:~vanvugt/mir/remove-test-macros
Diff against target: 15 lines (+4/-0)
1 file modified
CMakeLists.txt (+4/-0)
To merge this branch: bzr merge lp:~vanvugt/mir/workaround-1674201
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Needs Fixing
Kevin DuBois (community) Approve
Alan Griffiths Approve
Alexandros Frantzis (community) Approve
Review via email: mp+320302@code.launchpad.net

Commit message

Work around libudev-dev bug: Incorrect libdir in libudev.pc (LP: #1674201)

Description of the change

This and the prereq branch are what is required to get arm64 builds on zesty working. Although this branch in particular is also required for armhf.

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

PASSED: Continuous integration, rev:4095
https://mir-jenkins.ubuntu.com/job/mir-ci/3190/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4289
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4376
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4366
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4366
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4366
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4316
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4316/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4316
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4316/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4316
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4316/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4316
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4316/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4316
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4316/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4316
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4316/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

I am OK with the workaround as a temporary measure, but we should also fix the core problem in the udev package. Otherwise, our temporary workaround risks becoming permanent.

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> I am OK with the workaround as a temporary measure, but we should also fix the
> core problem in the udev package. Otherwise, our temporary workaround risks
> becoming permanent.

+1

review: Approve
Revision history for this message
Kevin DuBois (kdub) wrote :

I would recommend against maintenance and use of cross-compile-chroot.sh. Having a dirty crossbuild chroot and exporting dpkg-architecture before running cmake commands is usually how I cross compile. Don't mind the change though if the script is still useful.

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1209/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4302/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1275/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4389
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4379
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4379
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4379
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4331
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4331/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4331
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4331/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4331
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4331/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4331/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4331/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4331
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4331/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Hmm, now blocked behind:

https://code.launchpad.net/~raof/mir/fix-android-only-build/+merge/320448

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2017-03-10 19:47:57 +0000
3+++ CMakeLists.txt 2017-03-20 05:27:10 +0000
4@@ -207,7 +207,11 @@
5 find_package(GLog REQUIRED)
6 find_package(GFlags REQUIRED)
7 find_package(LTTngUST REQUIRED)
8+
9 pkg_check_modules(UDEV REQUIRED libudev)
10+# Work around libudev-dev bug LP: #1674201 which sets the wrong lib path:
11+list(INSERT UDEV_LDFLAGS 0 "-L${MIR_CHROOT}/lib/${TARGET_ARCH}")
12+
13 pkg_check_modules(GLIB REQUIRED glib-2.0)
14
15 include_directories (SYSTEM ${GLESv2_INCLUDE_DIRS})

Subscribers

People subscribed via source and target branches