summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-02-24 18:02:03 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-29 16:50:52 +0100
commit0d91032b846d27d9474f42ba4a354bb7615cfc56 (patch)
treec077ec3dc8cd95fc731162921378571fceca31ab /meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch
parent4812871780ba0765b237bf482d10a39d4a0dccfe (diff)
downloadpoky-0d91032b846d27d9474f42ba4a354bb7615cfc56.tar.gz
systemtap: update to 3.1
Removed patches are in upstream. Rebase monitor-option.patch and no-msgfmt-check.patch Add support for python 3 probes (this necessitates the 0001-Do-not-let-configure-write-a-python-location-into-th.patch and the Add 0001-Install-python-modules-to-correct-library-dir.patch to install python modules to correct destination). Add perl to RDEPENDS to fix a QA warning about one of the installed files. (From OE-Core rev: e3bccfba499565ea13f154a11dadcab48ef5e0ab) (From OE-Core rev: 74f390351bdf5b8749cba6e2345ef14d3ff9f077) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch')
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch b/meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch
deleted file mode 100644
index 2bf0742a1d..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From d940aa0079c253b958cf9158e9ec7922ecf464f9 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Wed, 9 Nov 2016 00:00:48 +0000
7Subject: [PATCH] staprun: fix linking if monitor is enabled
8
9If the monitor is enabled, monitor.c needs to link against json-c and ncurses.
10Instead of adding these linker flags to AM_CFLAGS (global CC flags) add them to
11stapio_LDADD.
12
13Apart from being the "right" thing to do, this fixes build failures on systems
14such as current Ubuntu (which defaults to using --as-needed and similar) where
15link order is important.
16---
17 staprun/Makefile.am | 7 +++----
18 1 file changed, 3 insertions(+), 4 deletions(-)
19
20diff --git a/staprun/Makefile.am b/staprun/Makefile.am
21index 63d4088..66b3e21 100644
22--- a/staprun/Makefile.am
23+++ b/staprun/Makefile.am
24@@ -42,12 +42,11 @@ staprun_CXXFLAGS += $(nss_CFLAGS)
25 staprun_LDADD += $(nss_LIBS)
26 endif
27
28-if HAVE_MONITOR_LIBS
29-AM_CFLAGS += $(jsonc_LIBS) $(ncurses_LIBS)
30-endif
31-
32 stapio_SOURCES = stapio.c mainloop.c common.c ctl.c relay.c relay_old.c monitor.c
33 stapio_LDADD = libstrfloctime.a -lpthread
34+if HAVE_MONITOR_LIBS
35+stapio_LDADD += $(jsonc_LIBS) $(ncurses_LIBS)
36+endif
37
38 man_MANS = staprun.8
39
40--
412.8.1