Merge lp:~cjwatson/ubuntu-app-launch/porting into lp:ubuntu-app-launch/14.04

[Colin Watson]

Use LTTng only on architectures where it is available.

Use LTTng only on architectures where it is available. This should let upstart-app-launch build on all architectures again (it lost arm64 support since saucy).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:136
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/250/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/110

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/upstart-app-launch-ci/250/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

A little worried we may need arm64 support, but not going to solve that problem today :-)

review: Approve

[Dimitri John Ledkov (xnox)]

liblttng-ust-dev is available on ppc64el. No longer needed...

review: Needs Information

[Colin Watson (cjwatson)]

I'd like to withdraw this, as Dimitri ported ust to arm64 and ppc64el over the weekend, and so upstart-app-launch now builds without this.

review: Disapprove

Unmerged revisions

136. By Colin Watson on 2014-03-11

Use LTTng only on architectures where it is available.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-13 22:43:55 +0000
+++ CMakeLists.txt	2014-03-11 12:30:44 +0000
@@ -17,7 +17,6 @@
 include(UseGlibGeneration)
 include(UseGdbusCodegen)
 include(UseConstantBuilder)
-include(UseLttngGenTp)
 
 # Workaround for libexecdir on debian
 if (EXISTS "/etc/debian_version") 
@@ -61,8 +60,9 @@
 pkg_check_modules(DBUSTEST REQUIRED dbustest-1>=14.04.0)
 include_directories(${DBUSTEST_INCLUDE_DIRS})
 
-pkg_check_modules(LTTNG REQUIRED lttng-ust)
+pkg_check_modules(LTTNG lttng-ust)
 include_directories(${LTTNG_INCLUDE_DIRS})
+include(UseLttngGenTp)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 
=== modified file 'cmake/UseLttngGenTp.cmake'
--- cmake/UseLttngGenTp.cmake	2013-12-04 11:58:40 +0000
+++ cmake/UseLttngGenTp.cmake	2014-03-11 12:30:44 +0000
@@ -3,22 +3,30 @@
   cmake_policy(SET CMP0011 NEW)
 endif(POLICY CMP0011)
 
-find_program(LTTNG_GEN_TP NAMES lttng-gen-tp DOC "lttng-gen-tp executable")
-if(NOT LTTNG_GEN_TP)
-  message(FATAL_ERROR "Excutable lttng-gen-top not found")
+if(LTTNG_FOUND)
+  find_program(LTTNG_GEN_TP NAMES lttng-gen-tp DOC "lttng-gen-tp executable")
+  if(NOT LTTNG_GEN_TP)
+    message(FATAL_ERROR "Excutable lttng-gen-top not found")
+  endif()
 endif()
 
 function(add_lttng_gen_tp)
 	set(_one_value NAME)
 	cmake_parse_arguments (arg "" "${_one_value}" "" ${ARGN})
 
-	add_custom_command(
-		OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.h" "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.c"
-		COMMAND "${LTTNG_GEN_TP}"
-			-o "${arg_NAME}.h"
-			-o "${arg_NAME}.c"
-			"${CMAKE_CURRENT_SOURCE_DIR}/${arg_NAME}.tp"
-		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-		DEPENDS "${arg_NAME}.tp"
-	)
+	if(LTTNG_FOUND)
+		add_custom_command(
+			OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.h" "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.c"
+			COMMAND "${LTTNG_GEN_TP}"
+				-o "${arg_NAME}.h"
+				-o "${arg_NAME}.c"
+				"${CMAKE_CURRENT_SOURCE_DIR}/${arg_NAME}.tp"
+			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+			DEPENDS "${arg_NAME}.tp"
+		)
+	else()
+		configure_file("${CMAKE_SOURCE_DIR}/null-tracepoint.c" "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.c")
+		configure_file("${CMAKE_SOURCE_DIR}/null-tracepoint.h" "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.h")
+		set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.c;${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.h")
+	endif()
 endfunction(add_lttng_gen_tp)
 
=== modified file 'debian/control'
--- debian/control	2014-02-11 03:14:30 +0000
+++ debian/control	2014-03-11 12:30:44 +0000
@@ -13,7 +13,7 @@
                libglib2.0-dev,
                libgtest-dev,
                libjson-glib-dev,
-               liblttng-ust-dev,
+               liblttng-ust-dev [amd64 armhf i386 powerpc],
                libnih-dbus-dev,
                libnih-dev,
                libupstart-dev,
 
=== added file 'null-tracepoint.c'
--- null-tracepoint.c	1970-01-01 00:00:00 +0000
+++ null-tracepoint.c	2014-03-11 12:30:44 +0000
@@ -0,0 +1,3 @@
+/* Dummy substitute for a C source file generated by lttng-gen-tp, used on
+ * architectures where the real thing is not available.
+ */
 
=== added file 'null-tracepoint.h'
--- null-tracepoint.h	1970-01-01 00:00:00 +0000
+++ null-tracepoint.h	2014-03-11 12:30:44 +0000
@@ -0,0 +1,4 @@
+/* Dummy substitute for a header file generated by lttng-gen-tp, used on
+ * architectures where the real thing is not available.
+ */
+#define tracepoint(provider, name, ...)