From 9f592667803ff915fc0764ffd8b46ec767af98d5 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Thu, 1 Mar 2012 23:04:22 +0100 Subject: 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 --- recipes-core/openjdk/openjdk-6-common.inc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'recipes-core/openjdk/openjdk-6-common.inc') 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 \ -- cgit v1.2.3-54-g00ecf