diff options
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-cross.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-cross.inc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index 6c0f949..ff682f1 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc | |||
@@ -47,16 +47,13 @@ require openjdk-8-common.inc | |||
47 | 47 | ||
48 | JAVA_HOME[unexport] = "1" | 48 | JAVA_HOME[unexport] = "1" |
49 | 49 | ||
50 | SRC_URI_append = "\ | 50 | SRC_URI:append = "\ |
51 | file://jvm.cfg \ | 51 | file://jvm.cfg \ |
52 | file://0011-autoconf-fix-CC-with-arguments-detection.patch \ | 52 | file://0011-autoconf-fix-CC-with-arguments-detection.patch \ |
53 | file://0012-autoconf-NativeCompilation-remove-sysroot.patch \ | 53 | file://0012-autoconf-NativeCompilation-remove-sysroot.patch \ |
54 | " | 54 | " |
55 | 55 | ||
56 | BUILD_CFLAGS_append = " -Wno-stringop-overflow -Wno-error" | 56 | EXTRA_OECONF:append = "\ |
57 | TARGET_CFLAGS_append = " -Wno-stringop-overflow -Wno-error" | ||
58 | |||
59 | EXTRA_OECONF_append = "\ | ||
60 | --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ | 57 | --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ |
61 | \ | 58 | \ |
62 | --with-tools-dir=${STAGING_DIR_NATIVE} \ | 59 | --with-tools-dir=${STAGING_DIR_NATIVE} \ |
@@ -76,16 +73,16 @@ EXTRA_OECONF_append = "\ | |||
76 | ${@jdk_configure_options(d)} \ | 73 | ${@jdk_configure_options(d)} \ |
77 | " | 74 | " |
78 | 75 | ||
79 | do_configure_prepend() { | 76 | do_configure:prepend() { |
80 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" | 77 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" |
81 | export ${@jdk_environment_options(d)} | 78 | export ${@jdk_environment_options(d)} |
82 | } | 79 | } |
83 | 80 | ||
84 | do_configure_append() { | 81 | do_configure:append() { |
85 | sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk | 82 | sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk |
86 | } | 83 | } |
87 | 84 | ||
88 | do_install_append() { | 85 | do_install:append() { |
89 | if ${@bb.utils.contains('PACKAGECONFIG', 'repack', 'true', 'false', d)} ; then | 86 | if ${@bb.utils.contains('PACKAGECONFIG', 'repack', 'true', 'false', d)} ; then |
90 | if [ -d ${D}${JDK_HOME} ] ; then | 87 | if [ -d ${D}${JDK_HOME} ] ; then |
91 | find ${D}${JDK_HOME} -name "*.jar" -print0 | \ | 88 | find ${D}${JDK_HOME} -name "*.jar" -print0 | \ |
@@ -102,10 +99,12 @@ do_install_append() { | |||
102 | fi | 99 | fi |
103 | } | 100 | } |
104 | 101 | ||
102 | do_install[vardepsexclude] += "BB_NUMBER_THREADS" | ||
103 | |||
105 | export MAKE_VERBOSE = "y" | 104 | export MAKE_VERBOSE = "y" |
106 | export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip" | 105 | export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip" |
107 | 106 | ||
108 | EXTRA_OEMAKE_append = '\ | 107 | EXTRA_OEMAKE:append = '\ |
109 | ${@jdk_make_options(d)} \ | 108 | ${@jdk_make_options(d)} \ |
110 | ALT_SDT_H="${STAGING_INCDIR}" \ | 109 | ALT_SDT_H="${STAGING_INCDIR}" \ |
111 | ALT_CUPS_HEADERS_PATH="${STAGING_INCDIR}" \ | 110 | ALT_CUPS_HEADERS_PATH="${STAGING_INCDIR}" \ |
@@ -133,4 +132,4 @@ PACKAGE_PREPROCESS_FUNCS += "remove_debuglink" | |||
133 | 132 | ||
134 | # FIXME libjsig.so is a symlink to a .so but this one is valid | 133 | # FIXME libjsig.so is a symlink to a .so but this one is valid |
135 | # FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped | 134 | # FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped |
136 | INSANE_SKIP_${PN} = "dev-so already-stripped" | 135 | INSANE_SKIP:${PN} = "dev-so already-stripped" |