summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2010-07-17 00:43:47 +0200
committerHenning Heinold <heinold@inf.fu-berlin.de>2010-07-17 14:11:51 +0200
commit7a52e35ec03bbd8aba052b7e74d90b6fe192a155 (patch)
treefb6e5038b960bed63929aa401cb3cea58d11f21a /recipes
parenta6e5816456eca3f49e806747a5b7a2bd7fe3ccba (diff)
openjdk-6: use zip-native rather than host-zip, similiar to icedtea6-native
* bump INC_PR
Diffstat (limited to 'recipes')
-rw-r--r--recipes/openjdk/openjdk-6-common.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes/openjdk/openjdk-6-common.inc b/recipes/openjdk/openjdk-6-common.inc
index 9db2a7c433..8cbf8c39d5 100644
--- a/recipes/openjdk/openjdk-6-common.inc
+++ b/recipes/openjdk/openjdk-6-common.inc
@@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET"
S = "${WORKDIR}/${ICEDTEA}"
B = "${S}/build"
-INC_PR = "r6"
+INC_PR = "r7"
SRC_URI = "\
${ICEDTEA_URI} \
@@ -35,6 +35,7 @@ DEPENDS = "giflib libpng jpeg cups \
ant-native alsa-lib libffi \
icedtea6-native fastjar \
llvm2.7 cacaoh-openjdk-native \
+ zip-native \
"
# The OpenJDK build with interpreter optimizations for ARM depends on a binary
@@ -223,6 +224,7 @@ EXTRA_OEMAKE += ' \
OE_CPPFLAGS="${TARGET_CPPFLAGS}" \
OE_CXXFLAGS="${TARGET_CXXFLAGS}" \
OE_LDFLAGS="${TARGET_LDFLAGS}" \
+ ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \
'
# Puts an OE specific string into the binary making it possible for the user