From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Mon, 9 Jan 2017 21:00:51 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/jgalar/lttng-docs
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=9f587ffca5db72b89ed21e3f8d51278b7d421d3a;hp=-c;p=lttng-docs.git

Merge branch 'master' of https://github.com/jgalar/lttng-docs
---

9f587ffca5db72b89ed21e3f8d51278b7d421d3a
diff --combined 2.8/lttng-docs-2.8.txt
index 97709b6,b591836..996562e
--- a/2.8/lttng-docs-2.8.txt
+++ b/2.8/lttng-docs-2.8.txt
@@@ -4051,7 -4051,9 +4051,9 @@@ wget http://lttng.org/files/lttng-tools
  tar -xf lttng-tools-latest-2.8.tar.bz2 &&
  cd lttng-tools-2.8.* &&
  ./configure --libdir=/usr/local/lib32 CFLAGS=-m32 CXXFLAGS=-m32 \
-             LDFLAGS='-L/usr/local/lib32 -L/usr/lib32' &&
+             LDFLAGS='-L/usr/local/lib32 -L/usr/lib32' \
+             --disable-bin-lttng --disable-bin-lttng-crash \
+             --disable-bin-lttng-relayd --disable-bin-lttng-sessiond &&
  make &&
  cd src/bin/lttng-consumerd &&
  sudo make install &&
@@@ -4362,7 -4364,7 +4364,7 @@@ The path:{liblttng-ust-cyg-profile*.so
  to the entry and exit points of functions.
  
  man:gcc(1) and man:clang(1) have an option named
 -https://gcc.gnu.org/onlinedocs/gcc/Code-Gen-Options.html[`-finstrument-functions`]
 +https://gcc.gnu.org/onlinedocs/gcc/Instrumentation-Options.html[`-finstrument-functions`]
  which generates instrumentation calls for entry and exit to functions.
  The LTTng-UST function tracing helpers,
  path:{liblttng-ust-cyg-profile.so} and
diff --combined 2.9/lttng-docs-2.9.txt
index 7fcf410,c95a25f..ac3727e
--- a/2.9/lttng-docs-2.9.txt
+++ b/2.9/lttng-docs-2.9.txt
@@@ -3822,7 -3822,9 +3822,9 @@@ wget http://lttng.org/files/lttng-tools
  tar -xf lttng-tools-latest-2.9.tar.bz2 &&
  cd lttng-tools-2.9.* &&
  ./configure --libdir=/usr/local/lib32 CFLAGS=-m32 CXXFLAGS=-m32 \
-             LDFLAGS='-L/usr/local/lib32 -L/usr/lib32' &&
+             LDFLAGS='-L/usr/local/lib32 -L/usr/lib32' \
+             --disable-bin-lttng --disable-bin-lttng-crash \
+             --disable-bin-lttng-relayd --disable-bin-lttng-sessiond &&
  make &&
  cd src/bin/lttng-consumerd &&
  sudo make install &&
@@@ -4133,7 -4135,7 +4135,7 @@@ The path:{liblttng-ust-cyg-profile*.so
  to the entry and exit points of functions.
  
  man:gcc(1) and man:clang(1) have an option named
 -https://gcc.gnu.org/onlinedocs/gcc/Code-Gen-Options.html[`-finstrument-functions`]
 +https://gcc.gnu.org/onlinedocs/gcc/Instrumentation-Options.html[`-finstrument-functions`]
  which generates instrumentation calls for entry and exit to functions.
  The LTTng-UST function tracing helpers,
  path:{liblttng-ust-cyg-profile.so} and