diff options
Diffstat (limited to 'recipes-core/openjdk/openjdk-6-common.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-6-common.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc index a53f8c9..c124e0c 100644 --- a/recipes-core/openjdk/openjdk-6-common.inc +++ b/recipes-core/openjdk/openjdk-6-common.inc | |||
@@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET" | |||
10 | S = "${WORKDIR}/${ICEDTEA}" | 10 | S = "${WORKDIR}/${ICEDTEA}" |
11 | B = "${S}/build" | 11 | B = "${S}/build" |
12 | 12 | ||
13 | INC_PR = "r16" | 13 | INC_PR = "r17" |
14 | 14 | ||
15 | SRC_URI = "\ | 15 | SRC_URI = "\ |
16 | ${ICEDTEA_URI} \ | 16 | ${ICEDTEA_URI} \ |
@@ -38,7 +38,6 @@ DEPENDS = "giflib libpng jpeg cups \ | |||
38 | ant-native \ | 38 | ant-native \ |
39 | fastjar-native \ | 39 | fastjar-native \ |
40 | icedtea6-native \ | 40 | icedtea6-native \ |
41 | cacaoh-openjdk-native \ | ||
42 | zip-native \ | 41 | zip-native \ |
43 | " | 42 | " |
44 | 43 | ||
@@ -74,8 +73,7 @@ export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}" | |||
74 | export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" | 73 | export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" |
75 | export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" | 74 | export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" |
76 | export CACAO_CONFIGURE_ARGS = "\ | 75 | export CACAO_CONFIGURE_ARGS = "\ |
77 | ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \ | 76 | ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']}" |
78 | --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-openjdk-0.99.4" | ||
79 | 77 | ||
80 | JAVA_HOME[unexport] = "1" | 78 | JAVA_HOME[unexport] = "1" |
81 | 79 | ||