Mir

Merge lp:~alan-griffiths/mir/free-libmircore-from-pthreads into lp:mir

Proposed by Alan Griffiths on 2017-06-19
Status: Merged
Approved by: Alan Griffiths on 2017-06-20
Approved revision: 4196
Merged at revision: 4196
Proposed branch: lp:~alan-griffiths/mir/free-libmircore-from-pthreads
Merge into: lp:mir
Diff against target: 12 lines (+3/-0)
1 file modified
src/core/CMakeLists.txt (+3/-0)
To merge this branch: bzr merge lp:~alan-griffiths/mir/free-libmircore-from-pthreads
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration 2017-06-19 Approve on 2017-06-20
Alberto Aguirre (community) 2017-06-19 Approve on 2017-06-20
Review via email: mp+325947@code.launchpad.net

Commit message

Don't link libmircore to (unused) use pthreads

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

PASSED: Continuous integration, rev:4196
https://mir-jenkins.ubuntu.com/job/mir-ci/3459/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4720
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4874
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4863
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4863
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4863
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4757
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4757/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4757
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4757/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4757
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4757/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4757
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4757/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4757
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4757/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/4757
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4757/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/4757
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4757/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4757
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4757/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Alberto Aguirre (albaguirre) wrote :

Seems reasonable.

review: Approve
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/core/CMakeLists.txt'
2--- src/core/CMakeLists.txt 2017-05-08 03:04:26 +0000
3+++ src/core/CMakeLists.txt 2017-06-19 16:46:57 +0000
4@@ -1,5 +1,8 @@
5 set(MIRCORE_ABI 1)
6
7+# We don't need libmircore to have an unused dependency on libpthread
8+string (REPLACE " -pthread " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
9+
10 add_library(mircore SHARED
11 fatal.cpp
12 geometry/rectangle.cpp

Subscribers

People subscribed via source and target branches