This is the mail archive of the
systemtap@sourceware.org
mailing list for the systemtap project.
small patch ...
- From: Michael Meeks <michael dot meeks at novell dot com>
- To: Mark Wielaard <mark at klomp dot org>
- Cc: systemtap at sourceware dot org
- Date: Fri, 15 Aug 2008 11:49:29 +0100
- Subject: small patch ...
- Organization: Novell, Inc.
- Reply-to: michael dot meeks at novell dot com
Hi guys,
I append a trivial patch for systemtap. I guess the SUSE wiki page also
needs updating to point out that it's broken in 11.0 by default, and
that you require HEAD with Frank's buildrun.cxx fix for the mach-default
include.
My patch will hopefully make similar problems easier to find in future
(for lovers of -v options ;-)
HTH,
Michael.
diff --git a/ChangeLog b/ChangeLog
index f688630..397308a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-15 Michael Meeks <michael.meeks@novell.com>
+
+ * configure.ac: suggest (SUSE) package name for dwfl.
+
+ * buildrun.cxx (compile_pass): if extremely verbose, pass through
+ output from stap checks - helps to debug generic test compile
+ problems.
+
2008-08-14 Dave Brolley <brolley@redhat.com>
PR 6834
diff --git a/buildrun.cxx b/buildrun.cxx
index 159e1c6..a265e4d 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -78,8 +78,12 @@ compile_pass (systemtap_session& s)
if (s.verbose > 3)
superverbose = "set -x;";
+ string redirecterrors = "> /dev/null 2>&1";
+ if (s.verbose > 6)
+ redirecterrors = "";
+
o << "stap_check_gcc = $(shell " << superverbose << " if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo \"$(1)\"; else echo \"$(2)\"; fi)" << endl;
- o << "stap_check_build = $(shell " << superverbose << " if $(CC) $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(KBUILD_CFLAGS) $(CFLAGS_KERNEL) $(EXTRA_CFLAGS) $(CFLAGS) -DKBUILD_BASENAME=\\\"" << s.module_name << "\\\" -Werror -S -o /dev/null -xc $(1) > /dev/null 2>&1 ; then echo \"$(2)\"; else echo \"$(3)\"; fi)" << endl;
+ o << "stap_check_build = $(shell " << superverbose << " if $(CC) $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(KBUILD_CFLAGS) $(CFLAGS_KERNEL) $(EXTRA_CFLAGS) $(CFLAGS) -DKBUILD_BASENAME=\\\"" << s.module_name << "\\\" -Werror -S -o /dev/null -xc $(1) " << redirecterrors << " ; then echo \"$(2)\"; else echo \"$(3)\"; fi)" << endl;
o << "SYSTEMTAP_RUNTIME = \"" << s.runtime_path << "\"" << endl;
diff --git a/configure.ac b/configure.ac
index 6728ace..5a5a093 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,7 +184,7 @@ if test $build_elfutils = no; then
# Need libdwfl-capable recent elfutils from Fedora
save_LIBS="$LIBS"
AC_CHECK_LIB(dw, dwfl_module_getsym,[],[
- AC_MSG_ERROR([missing elfutils development headers/libraries (dw 0.123+)])],
+ AC_MSG_ERROR([missing elfutils development headers/libraries (dw 0.123+) (libebl-devel may need to be installed)])],
[-Wl,--start-group -ldw -lebl -Wl,--end-group -lelf])
stap_LIBS="-Wl,--start-group -ldw -lebl -Wl,--end-group -lelf"
LIBS="$save_LIBS"
--
michael.meeks@novell.com <><, Pseudo Engineer, itinerant idiot