diff options
| author | Ming Liu <peter.x.liu@external.atlascopco.com> | 2017-04-23 08:54:55 +0200 |
|---|---|---|
| committer | Maxin B. John <maxin.john@intel.com> | 2017-05-29 13:52:22 +0300 |
| commit | 62d000070fae7588edfa77c171525708b07fdcb7 (patch) | |
| tree | 5354e0ba49fc6817939ebf1af31cfe7dabd94aea | |
| parent | bc4857da8748f1a3d5ac323ea5f2e5132aef9754 (diff) | |
| download | meta-java-62d000070fae7588edfa77c171525708b07fdcb7.tar.gz meta-java-62d000070fae7588edfa77c171525708b07fdcb7.tar.bz2 meta-java-62d000070fae7588edfa77c171525708b07fdcb7.zip | |
openjdk-8/openjre-8: merge some redundant code
A identical PATCHES_URI_append is being set both in openjdk-8 and
openjre-8, merge them into openjdk-8-cross.inc.
Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
| -rw-r--r-- | recipes-core/openjdk/openjdk-8-cross.inc | 14 | ||||
| -rw-r--r-- | recipes-core/openjdk/openjdk-8_102b14.bb | 14 | ||||
| -rw-r--r-- | recipes-core/openjdk/openjre-8_102b14.bb | 14 |
3 files changed, 14 insertions, 28 deletions
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index 3973fcf..247438f 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc @@ -1,6 +1,20 @@ JDK_HOME = "${libdir_jvm}/openjdk-8" JRE_HOME = "${libdir_jvm}/openjre-8" +# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch +# reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html +# by Roman Kennke (rkennke at redhat.com) +PATCHES_URI_append = "\ + file://openjdk8-restrict-to-staging-dir.patch;apply=no \ + file://openjdk8-fix-shark-build.patch;apply=no \ + file://openjdk8-fix-shark-stdc++11.patch;apply=no \ + file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \ + file://openjdk8-fix-adlc-flags.patch;apply=no \ + file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \ + file://openjdk8-fix-zero-mode-crash.patch;apply=no \ + file://openjdk8-add-missing-linker-flags.patch;apply=no \ +" + DEPENDS = "\ openjdk-8-native zip-native ant-native libxslt \ jpeg libpng krb5 libffi fontconfig freetype \ diff --git a/recipes-core/openjdk/openjdk-8_102b14.bb b/recipes-core/openjdk/openjdk-8_102b14.bb index 210c897..efed329 100644 --- a/recipes-core/openjdk/openjdk-8_102b14.bb +++ b/recipes-core/openjdk/openjdk-8_102b14.bb @@ -1,20 +1,6 @@ require openjdk-8-release-102b14.inc require openjdk-8-cross.inc -# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch -# reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html -# by Roman Kennke (rkennke at redhat.com) -PATCHES_URI_append = "\ - file://openjdk8-restrict-to-staging-dir.patch;apply=no \ - file://openjdk8-fix-shark-build.patch;apply=no \ - file://openjdk8-fix-shark-stdc++11.patch;apply=no \ - file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \ - file://openjdk8-fix-adlc-flags.patch;apply=no \ - file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \ - file://openjdk8-fix-zero-mode-crash.patch;apply=no \ - file://openjdk8-add-missing-linker-flags.patch;apply=no \ -" - do_install() { rm -rf ${D}${JDK_HOME} mkdir -p ${D}${JDK_HOME} diff --git a/recipes-core/openjdk/openjre-8_102b14.bb b/recipes-core/openjdk/openjre-8_102b14.bb index 88160e1..f47c62c 100644 --- a/recipes-core/openjdk/openjre-8_102b14.bb +++ b/recipes-core/openjdk/openjre-8_102b14.bb @@ -1,20 +1,6 @@ require openjdk-8-release-102b14.inc require openjdk-8-cross.inc -# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch -# reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html -# by Roman Kennke (rkennke at redhat.com) -PATCHES_URI_append = "\ - file://openjdk8-restrict-to-staging-dir.patch;apply=no \ - file://openjdk8-fix-shark-build.patch;apply=no \ - file://openjdk8-fix-shark-stdc++11.patch;apply=no \ - file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \ - file://openjdk8-fix-adlc-flags.patch;apply=no \ - file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \ - file://openjdk8-fix-zero-mode-crash.patch;apply=no \ - file://openjdk8-add-missing-linker-flags.patch;apply=no \ -" - do_install() { rm -rf ${D}${JRE_HOME} mkdir -p ${D}${JRE_HOME} |