4 files changed, 8 insertions, 4 deletions
diff --git a/recipes/classpath/classpath-native_0.97.2.bb b/recipes/classpath/classpath-native_0.97.2.bb
index 8a2c36b5c7..4de56028f9 100644
--- a/recipes/classpath/classpath-native_0.97.2.bb
+++ b/recipes/classpath/classpath-native_0.97.2.bb
@@ -1,6 +1,6 @@
 require classpath-native.inc
 
-PR = "r5"
+PR = "r6"
 
 # The code affected by the javanet-local patch
 # is usually not compiled. However if someone changes
@@ -15,6 +15,7 @@ SRC_URI += "\
   file://decimalformat.patch;patch=1 \
   file://cp-byte-loophelper.patch;patch=1;pnum=0 \
   file://miscompilation.patch;patch=1 \
+  file://toolwrapper-exithook.patch;patch=1 \
   "
 
 do_unpackpost() {
diff --git a/recipes/classpath/classpath-native_0.98.bb b/recipes/classpath/classpath-native_0.98.bb
index 9f4c8f9077..6659178b43 100644
--- a/recipes/classpath/classpath-native_0.98.bb
+++ b/recipes/classpath/classpath-native_0.98.bb
@@ -3,7 +3,7 @@ require classpath-native.inc
 # Deadlocks occur on at least amd64 hosts.
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r1"
+PR = "r2"
 
 # The code affected by the javanet-local patch
 # is usually not compiled. However if someone changes
@@ -14,6 +14,7 @@ SRC_URI += "\
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
   file://miscompilation.patch;patch=1 \
+  file://toolwrapper-exithook.patch;patch=1 \
   "
 
 do_unpackpost() {
diff --git a/recipes/classpath/classpath_0.97.2.bb b/recipes/classpath/classpath_0.97.2.bb
index e3b22fb6c5..3ec5bc4f15 100644
--- a/recipes/classpath/classpath_0.97.2.bb
+++ b/recipes/classpath/classpath_0.97.2.bb
@@ -10,9 +10,10 @@ SRC_URI += "\
   file://cp-byte-loophelper.patch;patch=1;pnum=0 \
   file://drawpolyline.patch;patch=1;pnum=0 \
   file://gtk-fix.patch;patch=1;pnum=0 \
+  file://toolwrapper-exithook.patch;patch=1; \
   "
 
-PR = "r9"
+PR = "r10"
 
 DEPENDS += "gtk+ gconf libxtst"
 
diff --git a/recipes/classpath/classpath_0.98.bb b/recipes/classpath/classpath_0.98.bb
index 6dc1e9e28b..ce695b34ea 100644
--- a/recipes/classpath/classpath_0.98.bb
+++ b/recipes/classpath/classpath_0.98.bb
@@ -5,9 +5,10 @@ SRC_URI += "\
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
   file://fix-gmp.patch;patch=1 \
+  file://toolwrapper-exithook.patch;patch=1 \
   "
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS += "gtk+ gconf libxtst"