Merge lp:~cjwatson/unity-scopes-api/lttng-optional into lp:unity-scopes-api

[Colin Watson]

Use LTTng only on architectures where it is available.

Use LTTng only on architectures where it is available. This should let unity-scopes-api build on arm64 and ppc64el.

[Colin Watson (cjwatson)]

Withdrawing this; LTTng has been ported to all architectures now.

review: Disapprove

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:179
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/361/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-amd64-ci/361
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-armhf-ci/361
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-armhf-ci/361/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-i386-ci/361

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/361/rebuild

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

Hi Colin, could you please either delete this branch or change the status under "Branch information" to Abandoned. Thanks

Unmerged revisions

179. By Colin Watson on 2014-03-17

Use LTTng only on architectures where it is available.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-07 11:52:22 +0000
+++ CMakeLists.txt	2014-03-17 16:22:40 +0000
@@ -57,10 +57,10 @@
 find_package(Boost COMPONENTS regex serialization REQUIRED)
 pkg_check_modules(UNITY_API libunity-api>=0.1.1 REQUIRED)
 pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
-pkg_check_modules(LTTNG_UST lttng-ust REQUIRED)
+pkg_check_modules(LTTNG_UST lttng-ust)
 pkg_check_modules(LIBURCU_BP liburcu-bp REQUIRED)
 find_program(LTTNG_EXECUTABLE lttng)
-if (NOT LTTNG_EXECUTABLE)
+if (LTTNG_UST_FOUND AND NOT LTTNG_EXECUTABLE)
     message(SEND_ERROR "Cannot find LTTng executable: ensure that lttng-tools is installed")
 endif()
 

=== modified file 'debian/control'
--- debian/control	2014-03-03 11:50:58 +0000
+++ debian/control	2014-03-17 16:22:40 +0000
@@ -16,8 +16,8 @@
                libcapnp-dev (>= 0.4.0),
                libzmq3-dev,
                libzmqpp-dev,
-               liblttng-ust-dev,
-               lttng-tools,
+               liblttng-ust-dev [amd64 armhf i386 powerpc],
+               lttng-tools [amd64 armhf i386 powerpc],
                qtbase5-dev,
                libjsoncpp-dev,
 Standards-Version: 3.9.4

=== modified file 'src/scopes/internal/CMakeLists.txt'
--- src/scopes/internal/CMakeLists.txt	2014-03-07 02:18:16 +0000
+++ src/scopes/internal/CMakeLists.txt	2014-03-17 16:22:40 +0000
@@ -1,4 +1,6 @@
-add_subdirectory(lttng)
+if(LTTNG_UST_FOUND)
+    add_subdirectory(lttng)
+endif()
 add_subdirectory(smartscopes)
 add_subdirectory(zmq_middleware)
 set(CAPNPROTO_FILES ${CAPNPROTO_FILES} PARENT_SCOPE)

=== modified file 'test/gtest/scopes/internal/CMakeLists.txt'
--- test/gtest/scopes/internal/CMakeLists.txt	2014-02-24 14:56:26 +0000
+++ test/gtest/scopes/internal/CMakeLists.txt	2014-03-17 16:22:40 +0000
@@ -2,7 +2,9 @@
 add_subdirectory(ConfigBase)
 add_subdirectory(DynamicLoader)
 add_subdirectory(JsonNode)
-add_subdirectory(lttng)
+if(LTTNG_UST_FOUND)
+    add_subdirectory(lttng)
+endif()
 add_subdirectory(MiddlewareFactory)
 add_subdirectory(Reaper)
 add_subdirectory(RegistryConfig)