cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unbreak build with java

Browse Source
This commit is contained in:
robert 2012-07-16 07:23:03 +00:00
parent d7cc47da1e
commit c7f15289d7
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
editors/libreoffice/patches/patch-hsqldb_makefile_mk Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-hsqldb_makefile_mk,v 1.1 2012/07/16 07:23:03 robert Exp $
--- hsqldb/makefile.mk.orig.port Sun Jul 15 23:36:07 2012
+++ hsqldb/makefile.mk Sun Jul 15 23:38:34 2012
@@ -61,8 +61,6 @@ PATCH_FILES=patches$/i96823.patch \
patches$/i104901.patch
.IF "$(JAVANUMVER:s/.//)" >= "000100060000"
-PATCH_FILES+= \
- patches$/jdbc-4.1.patch
.ENDIF
.IF "$(JAVACISGCJ)"=="yes" || "$(JAVA_SOURCE_VER)"=="1.5"
@@ -71,9 +69,9 @@ JAVA_HOME=
.ENDIF
.IF "$(JAVACISGCJ)"=="yes"
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.IF "$(debug)"!=""