diff options
Diffstat (limited to 'recipes-core/openjdk/openjdk-6-common.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-6-common.inc | 12 |
1 files changed, 3 insertions, 9 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" | |||
32 | PROVIDES += "${JDKPN} ${PACKAGES}" | 32 | PROVIDES += "${JDKPN} ${PACKAGES}" |
33 | 33 | ||
34 | DEPENDS = "giflib libpng jpeg cups \ | 34 | DEPENDS = "giflib libpng jpeg cups \ |
35 | xalan-j xerces-j rhino \ | 35 | rhino \ |
36 | freetype libxinerama libxt libxp libxrender libxtst libxi \ | 36 | freetype libxinerama libxt libxp libxrender libxtst libxi \ |
37 | alsa-lib libffi llvm2.8 \ | 37 | alsa-lib libffi llvm2.8 \ |
38 | ant-native \ | 38 | ant-native \ |
@@ -80,25 +80,19 @@ JAVA_HOME[unexport] = "1" | |||
80 | EXTRA_OECONF = "\ | 80 | EXTRA_OECONF = "\ |
81 | --disable-docs \ | 81 | --disable-docs \ |
82 | --disable-pulse-java \ | 82 | --disable-pulse-java \ |
83 | --disable-plugin \ | ||
84 | \ | 83 | \ |
85 | --with-ecj=${STAGING_BINDIR_NATIVE}/foo \ | ||
86 | --with-ecj-jar=${STAGING_DATADIR_JAVA_NATIVE}/ecj-bootstrap.jar \ | 84 | --with-ecj-jar=${STAGING_DATADIR_JAVA_NATIVE}/ecj-bootstrap.jar \ |
87 | --with-java=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/java \ | 85 | --with-java=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/java \ |
88 | --with-javac=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/javac \ | 86 | --with-javac=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/javac \ |
89 | --with-javah=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/javah \ | 87 | --with-javah=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/javah \ |
90 | --with-jar=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/jar \ | 88 | --with-jar=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/jar \ |
91 | --with-rmic=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/rmic \ | 89 | --with-rmic=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/rmic \ |
92 | --with-xalan2-jar=${STAGING_DATADIR_JAVA}/xalan2.jar \ | 90 | --with-native2ascii=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/native2ascii \ |
93 | --with-xalan2-serializer-jar=${STAGING_DATADIR_JAVA}/serializer.jar \ | ||
94 | --with-xerces2-jar=${STAGING_DATADIR_JAVA}/xercesImpl.jar \ | ||
95 | --with-rhino=${STAGING_DATADIR_JAVA}/rhino.jar \ | 91 | --with-rhino=${STAGING_DATADIR_JAVA}/rhino.jar \ |
92 | --without-ant-home \ | ||
96 | --with-openjdk-src-dir=${WORKDIR}/openjdk-src-dir \ | 93 | --with-openjdk-src-dir=${WORKDIR}/openjdk-src-dir \ |
97 | --with-gcj-home=${WORKDIR}/fake-jdk \ | ||
98 | --with-parallel-jobs=${JDK_JOBS} \ | 94 | --with-parallel-jobs=${JDK_JOBS} \ |
99 | \ | 95 | \ |
100 | --with-libgcj-jar=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/jre/lib/rt.jar \ | ||
101 | \ | ||
102 | --with-pkgversion=${PV} \ | 96 | --with-pkgversion=${PV} \ |
103 | --with-cc-for-build=${BUILD_CC} \ | 97 | --with-cc-for-build=${BUILD_CC} \ |
104 | --enable-zero \ | 98 | --enable-zero \ |