From e78c13f75a0fcb615ce678c9e940ed49607d30b7 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 9 Feb 2012 21:02:12 +0000
Subject: plan B, skip 1.7.0 patch when building with java 1.5.0

The original code should work, definitely works for me with java 1.5.0,
1.6.0 and 1.7.0, but not on 1.5.0 on the MacOSX PPC buildbot for some
reason.
---
 hsqldb/makefile.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'hsqldb/makefile.mk')

diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
index 26c24a08dcf8..e5004622ca4d 100755
--- a/hsqldb/makefile.mk
+++ b/hsqldb/makefile.mk
@@ -39,6 +39,8 @@ ANT_BUILDFILE=build$/build.xml
 
 .INCLUDE : antsettings.mk
 
+.INCLUDE :  tg_javav.mk
+
 .INCLUDE :  version.mk
 
 .IF "$(SOLAR_JAVA)" != ""
@@ -56,8 +58,12 @@ CONVERTFILES=build$/build.xml \
 PATCH_FILES=patches$/i96823.patch \
             patches$/i97032.patch \
             patches$/i103528.patch \
-            patches$/i104901.patch \
+            patches$/i104901.patch
+
+.IF "$(JAVANUMVER:s/.//)" >= "000100060000"
+PATCH_FILES+= \
             patches$/jdbc-4.1.patch
+.ENDIF
 
 .IF "$(JAVACISGCJ)"=="yes" || "$(JAVA_SOURCE_VER)"=="1.5"
 JAVA_HOME=
-- 
cgit