diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-11-09 00:07:11 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-15 15:18:49 +0000 |
| commit | 5ca6ac8739ea4a273df7b8e5c5f7d481619923d8 (patch) | |
| tree | 114a7248da9b5b853964480defe17e5f3106676c /meta | |
| parent | 2f8d2a74f73490c1ae35131d3eb3592f7ee0a1e4 (diff) | |
| download | openembedded-core-contrib-5ca6ac8739ea4a273df7b8e5c5f7d481619923d8.tar.gz | |
systemtap: fix native linking on recent Ubuntu
The latest Ubuntu uses yet more aggressive hardening options, which causes the
unconventional build order used by systemtap to fail.
[ YOCTO #10521 ]
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch | 41 | ||||
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.inc | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch b/meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch new file mode 100644 index 0000000000..2bf0742a1d --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch @@ -0,0 +1,41 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From d940aa0079c253b958cf9158e9ec7922ecf464f9 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Wed, 9 Nov 2016 00:00:48 +0000 +Subject: [PATCH] staprun: fix linking if monitor is enabled + +If the monitor is enabled, monitor.c needs to link against json-c and ncurses. +Instead of adding these linker flags to AM_CFLAGS (global CC flags) add them to +stapio_LDADD. + +Apart from being the "right" thing to do, this fixes build failures on systems +such as current Ubuntu (which defaults to using --as-needed and similar) where +link order is important. +--- + staprun/Makefile.am | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/staprun/Makefile.am b/staprun/Makefile.am +index 63d4088..66b3e21 100644 +--- a/staprun/Makefile.am ++++ b/staprun/Makefile.am +@@ -42,12 +42,11 @@ staprun_CXXFLAGS += $(nss_CFLAGS) + staprun_LDADD += $(nss_LIBS) + endif + +-if HAVE_MONITOR_LIBS +-AM_CFLAGS += $(jsonc_LIBS) $(ncurses_LIBS) +-endif +- + stapio_SOURCES = stapio.c mainloop.c common.c ctl.c relay.c relay_old.c monitor.c + stapio_LDADD = libstrfloctime.a -lpthread ++if HAVE_MONITOR_LIBS ++stapio_LDADD += $(jsonc_LIBS) $(ncurses_LIBS) ++endif + + man_MANS = staprun.8 + +-- +2.8.1 diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index 34cf22749f..a0f0e6859a 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -10,6 +10,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git \ file://x32_abi_time.patch \ file://monitor-option.patch \ file://no-msgfmt-check.patch \ + file://fix-monitor-linking.patch \ " # systemtap doesn't support mips |