diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-09 21:02:12 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-18 16:37:50 +0200 |
| commit | 4463387a43103600df7c0825e356f77f5ca90888 (patch) | |
| tree | 3a84d0ae5779d60785a26d415bfcb91b76d80d46 /hsqldb | |
| parent | e797c1f808b826aa79ce0227d56c25d626de3bb2 (diff) | |
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.
(cherry picked from commit e78c13f75a0fcb615ce678c9e940ed49607d30b7)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'hsqldb')
| -rwxr-xr-x | hsqldb/makefile.mk | 8 |
1 files changed, 7 insertions, 1 deletions
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= |