Kaydet (Commit) e78c13f7 authored tarafından Caolán McNamara's avatar Caolán McNamara

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.
üst bef2d8a6
......@@ -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=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment