summaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2012-03-01 21:56:41 +0100
committerHenning Heinold <heinold@inf.fu-berlin.de>2012-03-01 21:56:41 +0100
commit3e5427c5fe2c6f5cf28c828d9d3bc9e9f5633f22 (patch)
tree36c444be7891ac7ce3e4a519abf0abc43212190f /recipes-core
parent90c1a8f0fb966c7dbc96e4ad4bfa993a8c0c1c6f (diff)
downloadmeta-java-3e5427c5fe2c6f5cf28c828d9d3bc9e9f5633f22.tar.gz
openjdk-6-common: remove cacaoh-openjdk-native from dependencies it is not needed anymore
* bump INC_PR
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/openjdk/openjdk-6-common.inc6
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"
10S = "${WORKDIR}/${ICEDTEA}" 10S = "${WORKDIR}/${ICEDTEA}"
11B = "${S}/build" 11B = "${S}/build"
12 12
13INC_PR = "r16" 13INC_PR = "r17"
14 14
15SRC_URI = "\ 15SRC_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}"
74export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" 73export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2"
75export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" 74export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}"
76export CACAO_CONFIGURE_ARGS = "\ 75export 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
80JAVA_HOME[unexport] = "1" 78JAVA_HOME[unexport] = "1"
81 79