diff options
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-native.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-native.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc index bae5d09..321a43d 100644 --- a/recipes-core/openjdk/openjdk-8-native.inc +++ b/recipes-core/openjdk/openjdk-8-native.inc | |||
@@ -20,12 +20,13 @@ PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib-native" | |||
20 | EXTRA_OECONF_append = "\ | 20 | EXTRA_OECONF_append = "\ |
21 | --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ | 21 | --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ |
22 | \ | 22 | \ |
23 | --with-sys-root=${STAGING_DIR_NATIVE} \ | ||
24 | --with-tools-dir=${STAGING_DIR_NATIVE} \ | 23 | --with-tools-dir=${STAGING_DIR_NATIVE} \ |
25 | --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/icedtea7-native \ | 24 | --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/icedtea7-native \ |
26 | --with-extra-cflags='${CFLAGS}' \ | 25 | --with-extra-cflags='${CFLAGS}' \ |
27 | --with-extra-cxxflags='${CXXFLAGS}' \ | 26 | --with-extra-cxxflags='${CXXFLAGS}' \ |
28 | --with-extra-ldflags='${LDFLAGS}' \ | 27 | --with-extra-ldflags='${LDFLAGS}' \ |
28 | --with-freetype-include=${STAGING_INCDIR_NATIVE}/freetype2 \ | ||
29 | --with-freetype-lib=${STAGING_LIBDIR_NATIVE} \ | ||
29 | --with-stdc++lib=dynamic \ | 30 | --with-stdc++lib=dynamic \ |
30 | ${@jdk_configure_options(d)} \ | 31 | ${@jdk_configure_options(d)} \ |
31 | " | 32 | " |
@@ -51,6 +52,8 @@ EXTRA_OEMAKE_append = ' \ | |||
51 | 52 | ||
52 | do_configure_prepend() { | 53 | do_configure_prepend() { |
53 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" | 54 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" |
55 | export ${@jdk_environment_options(d)} | ||
56 | unset CC CXX | ||
54 | } | 57 | } |
55 | 58 | ||
56 | do_compile_prepend() { | 59 | do_compile_prepend() { |