strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plan B, skip 1.7.0 patch when building with java 1.5.0

Browse source 
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.
This commit is contained in:
Caolán McNamara 2012-02-09 21:02:12 +00:00
parent bef2d8a6f5
commit e78c13f75a
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hsqldb/makefile.mk
View file

@ -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=