Mir

Merge lp:~alan-griffiths/mir/fix-1724202 into lp:mir

Proposed by Alan Griffiths on 2017-10-17
Status: Merged
Approved by: Brandon Schaefer on 2017-10-17
Approved revision: 4293
Merged at revision: 4294
Proposed branch: lp:~alan-griffiths/mir/fix-1724202
Merge into: lp:mir
Diff against target: 22 lines (+5/-1)
1 file modified
src/miral/CMakeLists.txt (+5/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1724202
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) 2017-10-17 Approve on 2017-10-17
Mir CI Bot continuous-integration Approve on 2017-10-17
Review via email: mp+332343@code.launchpad.net

Commit message

Don't try to check libmiral symbols if dpkg-gensymbols isn't available. (LP: #1724202)

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

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

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

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

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/miral/CMakeLists.txt'
--- src/miral/CMakeLists.txt 2017-09-15 09:43:35 +0000
+++ src/miral/CMakeLists.txt 2017-10-17 11:05:47 +0000
@@ -96,13 +96,17 @@
9696
97# clang generates slightly different symbols (but we don't care)97# clang generates slightly different symbols (but we don't care)
98if (CMAKE_COMPILER_IS_GNUCXX)98if (CMAKE_COMPILER_IS_GNUCXX)
99 add_custom_target(check-miral-symbols ALL99 execute_process(COMMAND which dpkg-gensymbols RESULT_VARIABLE MIR_HAS_DPKG_GENSYMBOLS)
100
101 if (MIR_HAS_DPKG_GENSYMBOLS EQUAL 0)
102 add_custom_target(check-miral-symbols ALL
100 DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols103 DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols
101 COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols104 COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
102 COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -v${MIRAL_VERSION} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols105 COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -v${MIRAL_VERSION} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
103 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"106 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
104 VERBATIM107 VERBATIM
105 )108 )
109 endif()
106endif()110endif()
107111
108set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")112set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")

Subscribers

People subscribed via source and target branches