diff options
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-common.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-common.inc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index 1fbe7fe..0ef4750 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc | |||
@@ -8,13 +8,13 @@ require openjdk-common.inc | |||
8 | 8 | ||
9 | AUTOTOOLS_SCRIPT_PATH = "${S}/common/autoconf/" | 9 | AUTOTOOLS_SCRIPT_PATH = "${S}/common/autoconf/" |
10 | export AUTOCONF_DIR="${AUTOTOOLS_SCRIPT_PATH}" | 10 | export AUTOCONF_DIR="${AUTOTOOLS_SCRIPT_PATH}" |
11 | |||
12 | FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-8:" | 11 | FILESPATH =. "${FILE_DIRNAME}/patches-openjdk-8:" |
13 | 12 | ||
14 | # for weird openjdk-common.inc | 13 | # for weird openjdk-common.inc |
15 | S = "${WORKDIR}/${OPENJDK_HG_U}-${OPENJDK_CHANGESET}" | 14 | S = "${WORKDIR}/${OPENJDK_HG_U}-${OPENJDK_CHANGESET}" |
15 | export TOPDIR="${S}" | ||
16 | 16 | ||
17 | SRC_URI = " \ | 17 | SRC_URI = "\ |
18 | ${OPENJDK_URI} \ | 18 | ${OPENJDK_URI} \ |
19 | ${HOTSPOT_URI} \ | 19 | ${HOTSPOT_URI} \ |
20 | ${CORBA_URI} \ | 20 | ${CORBA_URI} \ |
@@ -155,16 +155,12 @@ def jdk_configure_options(d): | |||
155 | do_unpack[postfuncs] += "do_unpack_extract_submodules" | 155 | do_unpack[postfuncs] += "do_unpack_extract_submodules" |
156 | do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}" | 156 | do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}" |
157 | 157 | ||
158 | do_configure_prepend() { | ||
159 | export ${@jdk_environment_options(d)} | ||
160 | } | ||
161 | |||
162 | export DEBUG_BINARIES = "true" | 158 | export DEBUG_BINARIES = "true" |
163 | 159 | ||
164 | ALTERNATIVE_PRIORITY = "50" | 160 | ALTERNATIVE_PRIORITY = "50" |
165 | 161 | ||
166 | OPENJDK_UPDATE_VERSION = "${@d.getVar('PV').split('b')[0]}" | 162 | OPENJDK_UPDATE_VERSION = "${PV}" |
167 | OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV').split('b')[1]}" | 163 | OPENJDK_BUILD_NUMBER = "ga" |
168 | EXTRA_OECONF_append = "\ | 164 | EXTRA_OECONF_append = "\ |
169 | --with-build-number=${OPENJDK_BUILD_NUMBER} \ | 165 | --with-build-number=${OPENJDK_BUILD_NUMBER} \ |
170 | --with-update-version=${OPENJDK_UPDATE_VERSION} \ | 166 | --with-update-version=${OPENJDK_UPDATE_VERSION} \ |
@@ -176,6 +172,7 @@ EXTRA_OECONF_append = "\ | |||
176 | FLAGS_GCC6 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" | 172 | FLAGS_GCC6 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" |
177 | FLAGS_GCC7 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" | 173 | FLAGS_GCC7 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" |
178 | FLAGS_GCC8 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" | 174 | FLAGS_GCC8 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" |
175 | FLAGS_GCC9 = "-fno-lifetime-dse -fno-delete-null-pointer-checks" | ||
179 | 176 | ||
180 | # flags for -native, and for bits that need a host-tool during -cross | 177 | # flags for -native, and for bits that need a host-tool during -cross |
181 | BUILD_CFLAGS_append = " ${@openjdk_build_helper_get_build_cflags(d)}" | 178 | BUILD_CFLAGS_append = " ${@openjdk_build_helper_get_build_cflags(d)}" |