summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/openjdk')
-rw-r--r--recipes-core/openjdk/openjdk-7-common.inc2
-rw-r--r--recipes-core/openjdk/openjdk-8-common.inc1
-rw-r--r--recipes-core/openjdk/openjdk-8-cross.inc2
-rw-r--r--recipes-core/openjdk/openjdk-8-native.inc2
-rw-r--r--recipes-core/openjdk/openjdk-common.inc1
5 files changed, 5 insertions, 3 deletions
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 1ac3154..0ef6758 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -84,7 +84,7 @@ EXTRA_OECONF = " \
84 --with-jdk-src-zip=${WORKDIR}/${JDK_FILE} \ 84 --with-jdk-src-zip=${WORKDIR}/${JDK_FILE} \
85 --with-langtools-src-zip=${WORKDIR}/${LANGTOOLS_FILE} \ 85 --with-langtools-src-zip=${WORKDIR}/${LANGTOOLS_FILE} \
86 \ 86 \
87 --with-parallel-jobs=${@java_get_parallel_make(d)} \ 87 --with-parallel-jobs=${@openjdk_build_helper_get_parallel_make(d)} \
88 \ 88 \
89 --with-pkgversion=${PV} \ 89 --with-pkgversion=${PV} \
90 --with-cc-for-build=${BUILD_CC} \ 90 --with-cc-for-build=${BUILD_CC} \
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc
index 6b2f5e7..0c77d7c 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -5,6 +5,7 @@ LICENSE = "GPL-2.0-with-classpath-exception"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=3e0b59f8fac05c3c03d4a26bbda13f8f" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=3e0b59f8fac05c3c03d4a26bbda13f8f"
6 6
7inherit java autotools gettext qemu pkgconfig 7inherit java autotools gettext qemu pkgconfig
8inherit openjdk-build-helper
8 9
9AUTOTOOLS_SCRIPT_PATH = "${S}/common/autoconf/" 10AUTOTOOLS_SCRIPT_PATH = "${S}/common/autoconf/"
10export AUTOCONF_DIR="${AUTOTOOLS_SCRIPT_PATH}" 11export AUTOCONF_DIR="${AUTOTOOLS_SCRIPT_PATH}"
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc
index d0b2ec8..939155b 100644
--- a/recipes-core/openjdk/openjdk-8-cross.inc
+++ b/recipes-core/openjdk/openjdk-8-cross.inc
@@ -52,7 +52,7 @@ SRC_URI_append = "\
52" 52"
53 53
54EXTRA_OECONF_append = "\ 54EXTRA_OECONF_append = "\
55 --with-jobs=${@java_get_parallel_make(d)} \ 55 --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \
56 \ 56 \
57 --with-sys-root=${STAGING_DIR_HOST} \ 57 --with-sys-root=${STAGING_DIR_HOST} \
58 --with-tools-dir=${STAGING_DIR_NATIVE} \ 58 --with-tools-dir=${STAGING_DIR_NATIVE} \
diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc
index b782c32..e6f7933 100644
--- a/recipes-core/openjdk/openjdk-8-native.inc
+++ b/recipes-core/openjdk/openjdk-8-native.inc
@@ -20,7 +20,7 @@ PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng-native"
20PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib-native" 20PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib-native"
21 21
22EXTRA_OECONF_append = "\ 22EXTRA_OECONF_append = "\
23 --with-jobs=${@java_get_parallel_make(d)} \ 23 --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \
24 \ 24 \
25 --with-sys-root=${STAGING_DIR_NATIVE} \ 25 --with-sys-root=${STAGING_DIR_NATIVE} \
26 --with-tools-dir=${STAGING_DIR_NATIVE} \ 26 --with-tools-dir=${STAGING_DIR_NATIVE} \
diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc
index c92af40..4e2eb94 100644
--- a/recipes-core/openjdk/openjdk-common.inc
+++ b/recipes-core/openjdk/openjdk-common.inc
@@ -17,6 +17,7 @@ DEPENDS_append_libc-uclibc = " virtual/libiconv "
17DEPENDS_append = " qemu-native " 17DEPENDS_append = " qemu-native "
18 18
19inherit java autotools gettext qemu pkgconfig 19inherit java autotools gettext qemu pkgconfig
20inherit openjdk-build-helper
20 21
21B = "${S}/build" 22B = "${S}/build"
22 23