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

Use gcj 4.6 to bootstrap instead of jamvm. okay jasper@

Browse Source
This commit is contained in:
kurt 2012-10-19 22:29:49 +00:00
parent b6875bfd59
commit cb045bf328
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/jdk/1.6/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.34 2012/09/27 21:49:58 naddy Exp $
# $OpenBSD: Makefile,v 1.35 2012/10/19 22:29:49 kurt Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= amd64 i386
@ -8,9 +8,9 @@ COMMENT-jre= Java2(TM) Standard Edition Runtime Environment v${V}
V= 1.6.0.03
PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}
REVISION-main = 17
REVISION-main = 18
PKGNAME-jre= jre-${V}
REVISION-jre = 17
REVISION-jre = 18
CATEGORIES= devel/jdk java
DPB_PROPERTIES= parallel
@ -50,7 +50,10 @@ BUILD_DEPENDS= archivers/gtar \
archivers/bzip2 \
print/cups,-libs \
x11/openmotif
MODULES= converters/libiconv
MODULES= converters/libiconv gcc4
MODGCC4_VERSION= 4.6
MODGCC4_ARCHS= *
MODGCC4_LANGS= java
WANTLIB= X11 Xext Xi Xtst c m ossaudio pthread \
sndio stdc++ z
@ -119,7 +122,6 @@ FETCH_MANUALLY+= "from http://archive.apache.org/dist/xml/xalan-j/"
FETCH_MANUALLY+= "Get the Eclipse Java Compiler file:"
FETCH_MANUALLY+= " ecj-3.7.1.jar"
FETCH_MANUALLY+= "from http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/ecj-3.7.1.jar"
BUILD_DEPENDS+= lang/jamvm>=1.5.4
MAKE_ENV+= ALT_BOOTDIR=${WRKDIST} \
ALT_BOOTSTRAP=yes \
ECJ_JAR=${FULLDISTDIR}/ecj-3.7.1.jar

16
devel/jdk/1.6/patches/patch-bin_bootscript
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-bin_bootscript,v 1.1 2011/10/07 02:04:12 kurt Exp $
--- bin/bootscript.orig Sat Oct 1 08:17:38 2011
+++ bin/bootscript Sat Oct 1 10:10:04 2011
$OpenBSD: patch-bin_bootscript,v 1.2 2012/10/19 22:29:49 kurt Exp $
--- bin/bootscript.orig Tue Oct 9 14:51:46 2012
+++ bin/bootscript Tue Oct 9 17:24:51 2012
@@ -0,0 +1,87 @@
+#!/bin/sh
+
@ -16,16 +16,16 @@ $OpenBSD: patch-bin_bootscript,v 1.1 2011/10/07 02:04:12 kurt Exp $
+ ;;
+ esac;
+
+ exec jamvm $@
+ exec egij $@
+ ;;
+ jar)
+ exec gjar $@
+ exec egjar $@
+ ;;
+ javah)
+ exec gjavah -force $@
+ exec egjavah -force $@
+ ;;
+ javac)
+ # move -J args to jamvm
+ # move -J args to egij
+ # ecj doesn't like multiple -source, -target or
+ # -encoding arguments. only keep the last of each
+ # to make ecj happy
@ -82,7 +82,7 @@ $OpenBSD: patch-bin_bootscript,v 1.1 2011/10/07 02:04:12 kurt Exp $
+ SRC="-source 1.5"
+ fi
+
+ exec jamvm $JARGS -classpath $ECJ_JAR \
+ exec egij $JARGS -classpath $ECJ_JAR \
+ org.eclipse.jdt.internal.compiler.batch.Main -nowarn \
+ $SRC $TRG $ENC $ARGS
+ ;;