diff options
Diffstat (limited to 'recipes-core')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-common.inc | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index c78bb2a..04acc59 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc | |||
@@ -42,6 +42,21 @@ do_unpack_extract_submodules () { | |||
42 | tar xjf ${WORKDIR}/${NASHORN_FILE_LOCAL} --transform "s,-${NASHORN_CHANGESET},,g" | 42 | tar xjf ${WORKDIR}/${NASHORN_FILE_LOCAL} --transform "s,-${NASHORN_CHANGESET},,g" |
43 | } | 43 | } |
44 | 44 | ||
45 | do_patch_prepend() { | ||
46 | # use do_patch_prepend syntax and not pre/postfuncs to | ||
47 | # call do_unpack_extract_submodules | ||
48 | # *) the archiver.bbclass modifies WORKDIR, S, B,... | ||
49 | # and those modifications are lost otherwise, | ||
50 | # which leads to build failures in do_unpack_and_patch -> do_patch | ||
51 | func = 'do_unpack_extract_submodules' | ||
52 | bb.build.exec_func(func, d) | ||
53 | |||
54 | # delete X11 wrappers if x11 is not part of PACKAGECONFIG | ||
55 | if bb.utils.contains('PACKAGECONFIG', 'x11', False, True, d): | ||
56 | func_delete = 'do_unpack_delete_X11_wrappers' | ||
57 | bb.build.exec_func(func_delete, d) | ||
58 | } | ||
59 | |||
45 | do_unpack_delete_X11_wrappers() { | 60 | do_unpack_delete_X11_wrappers() { |
46 | find ${S}/jdk/src/solaris/classes/sun/awt/X11 -maxdepth 1 -name '*.java' -delete | 61 | find ${S}/jdk/src/solaris/classes/sun/awt/X11 -maxdepth 1 -name '*.java' -delete |
47 | } | 62 | } |
@@ -155,8 +170,8 @@ def jdk_configure_options(d): | |||
155 | options = package_config_option_cleanup(d) | 170 | options = package_config_option_cleanup(d) |
156 | return options[3] | 171 | return options[3] |
157 | 172 | ||
158 | do_unpack[postfuncs] += "do_unpack_extract_submodules" | 173 | #do_unpack[postfuncs] += "do_unpack_extract_submodules" |
159 | do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}" | 174 | #do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}" |
160 | 175 | ||
161 | export DEBUG_BINARIES = "true" | 176 | export DEBUG_BINARIES = "true" |
162 | 177 | ||