package/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch

   1 From f54894580da85e33f934c5c9bf5ab32d3fcce18b Mon Sep 17 00:00:00 2001
   2 From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
   3 Date: Wed, 30 Nov 2016 16:52:51 +0000
   4 Subject: [PATCH] doc/examples/Makefile.am: define C and C++ compilers for
   5  CMake
   6
   7 This prevents build failures when cross-compiling.
   8
   9 If we don't define the compiler, it will use the one from the host
  10 machine. For instance "/usr/bin/c++", which is incorrect.
  11
  12 The failure looks like this:
  13
  14 .............................................................
  15 [ 10%] Building CXX object CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o
  16 /usr/bin/c++   -Dtracepoint_provider_EXPORTS -I/br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/. -isystem /br/output/build/lttng-libust-2.9.0/include  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC   -o CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o -c /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp
  17 In file included from /br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint.h:29:0,
  18                  from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h:32,
  19                  from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp:26:
  20 /br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint-rcu.h:26:27: fatal error: urcu/compiler.h: No such file or directory
  21  #include <urcu/compiler.h>
  22                            ^
  23 compilation terminated.
  24 .............................................................
  25
  26 Pull request URL: https://github.com/lttng/lttng-ust/pull/41
  27
  28 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
  29 ---
  30  doc/examples/Makefile.am | 2 ++
  31  1 file changed, 2 insertions(+)
  32
  33 diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
  34 index 424b844..5bc1f4c 100644
  35 --- a/doc/examples/Makefile.am
  36 +++ b/doc/examples/Makefile.am
  37 @@ -152,7 +152,9 @@ all-local:
  38                                 cmake \
  39                                 -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \
  40                                 -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \
  41 +                               -DCMAKE_C_COMPILER="$(CC)" \
  42                                 -DCMAKE_C_FLAGS="$(CFLAGS) $(CPPFLAGS)" \
  43 +                               -DCMAKE_CXX_COMPILER="$(CXX)" \
  44                                 -DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
  45                                 -DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
  46                                 .. && \
  47 --
  48 2.10.1
  49