Mir

Merge lp:~vanvugt/mir/fix-1483469 into lp:mir

  1. fix-1483469
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 2829
Proposed branch: lp:~vanvugt/mir/fix-1483469
Merge into: lp:mir
Diff against target: 23 lines (+2/-0)
2 files modified
CMakeLists.txt (+1/-0)
src/platforms/mesa/server/x11/CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1483469
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alan Griffiths Approve
Review via email: mp+267625@code.launchpad.net

Commit message

Remember to link to all libraries you need (or put another way,
remember to declare all ABIs your depend on).
(LP: #1483469)

Description of the change

.

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Weird, I just wrote an almost identical fix in -c 2827 lp:~alan-griffiths/mir/make-mir_demo_server-dlopen-mir/+merge/267498

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

Just what I was trying locally

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2828
http://jenkins.qa.ubuntu.com/job/mir-ci/4524/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3478
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/338
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1010
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3426
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/673
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/673/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3426
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3426/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6212
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22455

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

review: Approve (continuous-integration)

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 2015-08-03 03:06:54 +0000
3+++ CMakeLists.txt 2015-08-11 09:13:34 +0000
4@@ -111,6 +111,7 @@
5 else()
6 # AddressSanitizer builds fail if we disallow undefined symbols
7 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
8+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
9 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
10 endif()
11
12
13=== modified file 'src/platforms/mesa/server/x11/CMakeLists.txt'
14--- src/platforms/mesa/server/x11/CMakeLists.txt 2015-06-24 22:59:22 +0000
15+++ src/platforms/mesa/server/x11/CMakeLists.txt 2015-08-11 09:13:34 +0000
16@@ -38,6 +38,7 @@
17 mirplatformservermesax11
18 PRIVATE
19 mirplatform
20+ mirclient # for make_event(). TODO: move make_event out of libmirclient?
21 EGL
22 GLESv2
23 X11

Subscribers

People subscribed via source and target branches