[systemtap/f18] oops, non-HAVE_JAVA requires some warning suppression patches

[fche]

commit 84bc71fedc11d51b46e3d98327da5a6af94a0529
Author: Frank Ch. Eigler <fche at redhat.com>
Date:   Tue May 14 13:11:20 2013 -0400

    oops, non-HAVE_JAVA requires some warning suppression patches

 non-java.patch |   24 ++++++++++++++++++++++++
 systemtap.spec |    4 ++++
 2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/non-java.patch b/non-java.patch
new file mode 100644
index 0000000..c517242
--- /dev/null
+++ b/non-java.patch
@@ -0,0 +1,24 @@
+commit 47a606a768b695b08afce63747b32336d9b7fff2
+Author: Frank Ch. Eigler <fche at 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);
diff --git a/systemtap.spec b/systemtap.spec
index 4d6143a..f12a65d 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -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}