diff options
author | Kai Kang <kai.kang@windriver.com> | 2016-04-11 14:39:46 +0800 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-04-11 08:07:26 -0300 |
commit | 1d125bfa18f7363bf9c9887434c441acbde10862 (patch) | |
tree | 1941c6ed93523c85d9f16129390005d41fc76b8d /recipes-core/icedtea/icedtea7-native.inc | |
parent | efc3daa7526a5ae5aad24a0f777d2274aab3d5c3 (diff) | |
download | meta-java-1d125bfa18f7363bf9c9887434c441acbde10862.tar.gz |
icedtea7-native: backport patch of jaxb to fix NullPointerException
Backport patch of jaxb from
https://java.net/projects/jaxb/sources/v2/revision/1864898
to fix NullPointerException.
See https://java.net/jira/browse/JAXB-860 as well.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/icedtea/icedtea7-native.inc')
-rw-r--r-- | recipes-core/icedtea/icedtea7-native.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index cb6b5d3..0ffe5d5 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc | |||
@@ -33,6 +33,7 @@ SRC_URI = " \ | |||
33 | ${ICEDTEA_PATCHES} \ | 33 | ${ICEDTEA_PATCHES} \ |
34 | ${OPENJDK_PATCHES} \ | 34 | ${OPENJDK_PATCHES} \ |
35 | file://allow-headless-build.patch;striplevel=0 \ | 35 | file://allow-headless-build.patch;striplevel=0 \ |
36 | file://jaxws_fix_NullPointerException.patch;apply=no \ | ||
36 | " | 37 | " |
37 | 38 | ||
38 | S = "${WORKDIR}/${ICEDTEA}" | 39 | S = "${WORKDIR}/${ICEDTEA}" |
@@ -154,6 +155,8 @@ do_configure_append() { | |||
154 | done | 155 | done |
155 | ${POST_CONFIGURE_CLEAN_X11} | 156 | ${POST_CONFIGURE_CLEAN_X11} |
156 | oe_runmake patch-boot | 157 | oe_runmake patch-boot |
158 | |||
159 | patch -p1 < ${WORKDIR}/jaxws_fix_NullPointerException.patch | ||
157 | } | 160 | } |
158 | 161 | ||
159 | EXTRA_OEMAKE = ' \ | 162 | EXTRA_OEMAKE = ' \ |