diff options
Diffstat (limited to 'recipes-core')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-common.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index ab4c870..cf14be9 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc | |||
@@ -39,6 +39,10 @@ do_unpack_extract_submodules () { | |||
39 | tar xjf ${WORKDIR}/${NASHORN_FILE} --transform "s,-${NASHORN_CHANGESET},,g" | 39 | tar xjf ${WORKDIR}/${NASHORN_FILE} --transform "s,-${NASHORN_CHANGESET},,g" |
40 | } | 40 | } |
41 | 41 | ||
42 | do_unpack_remove_X11_wrappers() { | ||
43 | find ${S}/jdk/src/solaris/classes/sun/awt/X11 -maxdepth 1 -name '*.java' -delete | ||
44 | } | ||
45 | |||
42 | def package_config_option_cleanup(d): | 46 | def package_config_option_cleanup(d): |
43 | distro_x11 = bb.utils.contains('DISTRO_FEATURES', 'x11', True, False, d) | 47 | distro_x11 = bb.utils.contains('DISTRO_FEATURES', 'x11', True, False, d) |
44 | distro_alsa = bb.utils.contains('DISTRO_FEATURES', 'alsa', True, False, d) | 48 | distro_alsa = bb.utils.contains('DISTRO_FEATURES', 'alsa', True, False, d) |
@@ -149,13 +153,11 @@ def jdk_configure_options(d): | |||
149 | return options[3] | 153 | return options[3] |
150 | 154 | ||
151 | do_unpack[postfuncs] += "do_unpack_extract_submodules" | 155 | do_unpack[postfuncs] += "do_unpack_extract_submodules" |
152 | 156 | do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_remove_X11_wrappers', d)}" | |
153 | POST_CONFIGURE_CLEAN_X11 = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'rm -f jdk/src/solaris/classes/sun/awt/X11/*.java', d)}" | ||
154 | 157 | ||
155 | do_patch_openjdk8() { | 158 | do_patch_openjdk8() { |
156 | olddir=`pwd` | 159 | olddir=`pwd` |
157 | cd "${S}" | 160 | cd "${S}" |
158 | ${POST_CONFIGURE_CLEAN_X11} | ||
159 | for OJ8P in ${WORKDIR}/openjdk8-*.patch; do | 161 | for OJ8P in ${WORKDIR}/openjdk8-*.patch; do |
160 | patch -p0 < ${OJ8P} | 162 | patch -p0 < ${OJ8P} |
161 | done | 163 | done |