lttng-ust-link.patch

   1 --- lttng-ust-2.9.0/liblttng-ust/Makefile.am.orig       2016-11-29 02:46:24.000000000 +0100
   2 +++ lttng-ust-2.9.0/liblttng-ust/Makefile.am    2016-12-25 00:30:14.048415399 +0100
   3 @@ -14,6 +14,7 @@
   4         error.h
   5  liblttng_ust_tracepoint_la_LIBADD = \
   6         -lurcu-bp \
   7 +       -ldl \
   8         -lpthread \
   9         $(top_builddir)/snprintf/libustsnprintf.la
  10  liblttng_ust_tracepoint_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
  11 @@ -87,6 +88,7 @@
  12         $(top_builddir)/libringbuffer/libringbuffer.la
  13
  14  liblttng_ust_la_LIBADD = \
  15 +       -ldl \
  16         -lpthread \
  17         -lrt \
  18         -lurcu-cds \
  19 --- lttng-ust-2.6.0/liblttng-ust-java/Makefile.am.orig  2015-01-26 21:09:30.334240517 +0100
  20 +++ lttng-ust-2.6.0/liblttng-ust-java/Makefile.am       2015-01-26 21:11:19.994235912 +0100
  21 @@ -12,7 +12,7 @@
  22  liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h
  23  nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h
  24
  25 -liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
  26 +liblttng_ust_java_la_LIBADD = -lc $(top_builddir)/liblttng-ust/liblttng-ust.la
  27
  28  $(jarfile): classnoinst.stamp
  29         $(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class
  30 --- lttng-ust-2.8.1/liblttng-ust-java-agent/jni/jul/Makefile.am.orig    2016-06-25 12:12:34.117486360 +0200
  31 +++ lttng-ust-2.8.1/liblttng-ust-java-agent/jni/jul/Makefile.am 2016-06-25 12:14:28.320201004 +0200
  32 @@ -7,7 +7,5 @@
  33  nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_agent_jul_LttngJulApi.h
  34
  35  liblttng_ust_jul_jni_la_LIBADD = -lc \
  36 -       -L$(top_builddir)/liblttng-ust/.libs \
  37 -       -L$(top_builddir)/liblttng-ust-java-agent/jni/common/.libs \
  38 -       -llttng-ust-context-jni \
  39 -       -llttng-ust
  40 +       $(top_builddir)/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la \
  41 +       $(top_builddir)/liblttng-ust/liblttng-ust.la
  42 --- lttng-ust-2.8.1/liblttng-ust-java-agent/jni/log4j/Makefile.am.orig  2016-06-25 12:12:34.117486360 +0200
  43 +++ lttng-ust-2.8.1/liblttng-ust-java-agent/jni/log4j/Makefile.am       2016-06-25 12:15:29.779868049 +0200
  44 @@ -7,7 +7,5 @@
  45  nodist_liblttng_ust_log4j_jni_la_SOURCES = org_lttng_ust_agent_log4j_LttngLog4jApi.h
  46
  47  liblttng_ust_log4j_jni_la_LIBADD = -lc \
  48 -       -L$(top_builddir)/liblttng-ust/.libs \
  49 -       -L$(top_builddir)/liblttng-ust-java-agent/jni/common/.libs \
  50 -       -llttng-ust-context-jni \
  51 -       -llttng-ust
  52 +       $(top_builddir)/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la \
  53 +       $(top_builddir)/liblttng-ust/liblttng-ust.la
  54 --- lttng-ust-2.8.1/liblttng-ust-java-agent/jni/common/Makefile.am.orig 2016-05-31 06:38:27.000000000 +0200
  55 +++ lttng-ust-2.8.1/liblttng-ust-java-agent/jni/common/Makefile.am      2016-06-25 12:15:51.336417933 +0200
  56 @@ -5,4 +5,4 @@
  57
  58  nodist_liblttng_ust_context_jni_la_SOURCES = org_lttng_ust_agent_context_LttngContextApi.h
  59
  60 -liblttng_ust_context_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
  61 +liblttng_ust_context_jni_la_LIBADD = -lc $(top_builddir)/liblttng-ust/liblttng-ust.la
  62 --- lttng-ust-2.8.1/liblttng-ust-python-agent/Makefile.am.orig  2016-06-25 12:16:24.649570794 +0200
  63 +++ lttng-ust-2.8.1/liblttng-ust-python-agent/Makefile.am       2016-06-25 12:19:01.568720691 +0200
  64 @@ -4,5 +4,5 @@
  65  AM_CFLAGS = -fno-strict-aliasing
  66  lib_LTLIBRARIES = liblttng-ust-python-agent.la
  67  liblttng_ust_python_agent_la_SOURCES = lttng_ust_python.c lttng_ust_python.h
  68 -liblttng_ust_python_agent_la_LIBADD = -lc -llttng-ust \
  69 -       -L$(top_builddir)/liblttng-ust/.libs
  70 +liblttng_ust_python_agent_la_LIBADD = -lc \
  71 +       $(top_builddir)/liblttng-ust/liblttng-ust.la