oops, non-HAVE_JAVA requires some warning suppression patches

This commit is contained in:
Frank Ch. Eigler 2013-05-14 13:11:20 -04:00
parent d6454a8d37
commit 84bc71fedc
2 changed files with 28 additions and 0 deletions

24
non-java.patch Normal file
View File

@ -0,0 +1,24 @@
commit 47a606a768b695b08afce63747b32336d9b7fff2
Author: Frank Ch. Eigler <fche@redhat.com>
Date: Tue May 14 13:09:55 2013 -0400
java support: snuff gcc warnings on non-HAVE_JAVA builds
diff --git a/tapset-method.cxx b/tapset-method.cxx
index 14ae6dd..bce3382 100644
--- a/tapset-method.cxx
+++ b/tapset-method.cxx
@@ -428,10 +428,12 @@ java_builder::build (systemtap_session & sess,
void
register_tapset_java (systemtap_session& s)
{
+ (void) s;
+
+#ifdef HAVE_JAVA
match_node* root = s.pattern_root;
derived_probe_builder *builder = new java_builder ();
-#ifdef HAVE_JAVA
root->bind_str (TOK_JAVA)
->bind_str (TOK_CLASS)->bind_str (TOK_METHOD)
->bind(builder);

View File

@ -117,6 +117,8 @@ BuildRequires: emacs
BuildRequires: jpackage-utils java-devel
%endif
Patch2: non-java.patch
# Install requirements
Requires: systemtap-client = %{version}-%{release}
Requires: systemtap-devel = %{version}-%{release}
@ -297,6 +299,8 @@ find . \( -name configure -o -name config.h.in \) -print | xargs touch
cd ..
%endif
%patch2 -p1
%build
%if %{with_bundled_elfutils}