summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-8-native.inc
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-native.inc')
-rw-r--r--recipes-core/openjdk/openjdk-8-native.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc
index 3282257..c02e183 100644
--- a/recipes-core/openjdk/openjdk-8-native.inc
+++ b/recipes-core/openjdk/openjdk-8-native.inc
@@ -17,7 +17,7 @@ PACKAGECONFIG[jpeg] = "--with-libjpeg=system,--with-libjpeg=bundled,jpeg-native"
17PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng-native" 17PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng-native"
18PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib-native" 18PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib-native"
19 19
20EXTRA_OECONF_append = "\ 20EXTRA_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-tools-dir=${STAGING_DIR_NATIVE} \ 23 --with-tools-dir=${STAGING_DIR_NATIVE} \
@@ -36,32 +36,32 @@ require openjdk-8-common.inc
36 36
37inherit native 37inherit native
38 38
39CFLAGS_append = " ${@jdk_cpp_options(d)}" 39CFLAGS:append = " ${@jdk_cpp_options(d)}"
40CPPFLAGS_append = "${@jdk_cpp_options(d)}" 40CPPFLAGS:append = "${@jdk_cpp_options(d)}"
41CXXFLAGS_append = " ${@jdk_cpp_options(d)}" 41CXXFLAGS:append = " ${@jdk_cpp_options(d)}"
42 42
43export MAKE_VERBOSE = "y" 43export MAKE_VERBOSE = "y"
44export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace" 44export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace"
45 45
46EXTRA_OEMAKE_append = ' \ 46EXTRA_OEMAKE:append = ' \
47 ${@jdk_make_options(d)} \ 47 ${@jdk_make_options(d)} \
48 MAKE_VERBOSE=y VERBOSE=-s LOG_LEVEL=trace \ 48 MAKE_VERBOSE=y VERBOSE=-s LOG_LEVEL=trace \
49 QUIETLY= \ 49 QUIETLY= \
50 images \ 50 images \
51' 51'
52 52
53do_configure_prepend() { 53do_configure:prepend() {
54 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" 54 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}"
55 export ${@jdk_environment_options(d)} 55 export ${@jdk_environment_options(d)}
56 unset CC CXX 56 unset CC CXX
57} 57}
58 58
59do_compile_prepend() { 59do_compile:prepend() {
60 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" 60 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}"
61 rm -f "${B}/images/j2sdk-image/jre/lib/security/cacerts" 61 rm -f "${B}/images/j2sdk-image/jre/lib/security/cacerts"
62} 62}
63 63
64do_compile_append() { 64do_compile:append() {
65 set -x 65 set -x
66 mkdir -p ${B}/certs 66 mkdir -p ${B}/certs
67 for pem in $(find ${STAGING_DATADIR}/ca-certificates -name "*.crt") 67 for pem in $(find ${STAGING_DATADIR}/ca-certificates -name "*.crt")
@@ -90,4 +90,4 @@ do_install() {
90} 90}
91 91
92# FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped 92# FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped
93INSANE_SKIP_${PN} = "already-stripped" 93INSANE_SKIP:${PN} = "already-stripped"