openjdk6: clean up configure options

* removed unknown options
* use native2ascii from our icedtea native build
* unset ant-home
* remove xalan-j and xerces-j dependencies, not needed anymore

2 files changed, 3 insertions, 10 deletions

diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc
index d24f4a5..ae6a820 100644
--- a/recipes-core/openjdk/openjdk-6-common.inc
+++ b/recipes-core/openjdk/openjdk-6-common.inc
@@ -32,7 +32,7 @@ PN = "${JDKPN}-jre"
 PROVIDES += "${JDKPN} ${PACKAGES}"
 
 DEPENDS = "giflib libpng jpeg cups \
-           xalan-j xerces-j rhino \
+           rhino \
            freetype libxinerama libxt libxp libxrender libxtst libxi \
            alsa-lib libffi llvm2.8 \
            ant-native \
@@ -80,25 +80,19 @@ JAVA_HOME[unexport] = "1"
 EXTRA_OECONF = "\
         --disable-docs \
         --disable-pulse-java \
-        --disable-plugin \
         \
-        --with-ecj=${STAGING_BINDIR_NATIVE}/foo \
         --with-ecj-jar=${STAGING_DATADIR_JAVA_NATIVE}/ecj-bootstrap.jar \
         --with-java=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/java \
         --with-javac=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/javac \
         --with-javah=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/javah \
         --with-jar=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/jar \
         --with-rmic=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/rmic \
-        --with-xalan2-jar=${STAGING_DATADIR_JAVA}/xalan2.jar \
-        --with-xalan2-serializer-jar=${STAGING_DATADIR_JAVA}/serializer.jar \
-        --with-xerces2-jar=${STAGING_DATADIR_JAVA}/xercesImpl.jar \
+        --with-native2ascii=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/native2ascii \
         --with-rhino=${STAGING_DATADIR_JAVA}/rhino.jar \
+        --without-ant-home \
         --with-openjdk-src-dir=${WORKDIR}/openjdk-src-dir \
-        --with-gcj-home=${WORKDIR}/fake-jdk \
         --with-parallel-jobs=${JDK_JOBS} \
         \
-        --with-libgcj-jar=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/jre/lib/rt.jar \
-        \
         --with-pkgversion=${PV} \
         --with-cc-for-build=${BUILD_CC} \
         --enable-zero \
diff --git a/recipes-core/openjdk/openjdk-6-release-6b24.inc b/recipes-core/openjdk/openjdk-6-release-6b24.inc
index 984d7ba..00a14c2 100644
--- a/recipes-core/openjdk/openjdk-6-release-6b24.inc
+++ b/recipes-core/openjdk/openjdk-6-release-6b24.inc
@@ -10,7 +10,6 @@ DEPENDS += "binutils"
 EXTRA_OECONF += "\
         --with-jdk-home=${WORKDIR}/fake-jdk \
         --with-jar=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/jar \
-        --with-out-rhino \
         --with-jaxws-drop-zip=${DL_DIR}/${JAXWS_FILE} \
         --with-jaf-drop-zip=${DL_DIR}/${JAF_FILE} \
         --with-jaxp-drop-zip=${DL_DIR}/${JAXP_FILE} \