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:46:08 +0300 |
commit | 4d919975d5bc5501fdebe914fd11744107ca16a7 (patch) | |
tree | 5354e0ba49fc6817939ebf1af31cfe7dabd94aea | |
parent | ec54d1c6c97f619882c3b8593157f6529b3cb1f8 (diff) | |
download | meta-java-4d919975d5bc5501fdebe914fd11744107ca16a7.tar.gz |
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 @@ | |||
1 | JDK_HOME = "${libdir_jvm}/openjdk-8" | 1 | JDK_HOME = "${libdir_jvm}/openjdk-8" |
2 | JRE_HOME = "${libdir_jvm}/openjre-8" | 2 | JRE_HOME = "${libdir_jvm}/openjre-8" |
3 | 3 | ||
4 | # some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch | ||
5 | # reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html | ||
6 | # by Roman Kennke (rkennke at redhat.com) | ||
7 | PATCHES_URI_append = "\ | ||
8 | file://openjdk8-restrict-to-staging-dir.patch;apply=no \ | ||
9 | file://openjdk8-fix-shark-build.patch;apply=no \ | ||
10 | file://openjdk8-fix-shark-stdc++11.patch;apply=no \ | ||
11 | file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \ | ||
12 | file://openjdk8-fix-adlc-flags.patch;apply=no \ | ||
13 | file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \ | ||
14 | file://openjdk8-fix-zero-mode-crash.patch;apply=no \ | ||
15 | file://openjdk8-add-missing-linker-flags.patch;apply=no \ | ||
16 | " | ||
17 | |||
4 | DEPENDS = "\ | 18 | DEPENDS = "\ |
5 | openjdk-8-native zip-native ant-native libxslt \ | 19 | openjdk-8-native zip-native ant-native libxslt \ |
6 | jpeg libpng krb5 libffi fontconfig freetype \ | 20 | 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 @@ | |||
1 | require openjdk-8-release-102b14.inc | 1 | require openjdk-8-release-102b14.inc |
2 | require openjdk-8-cross.inc | 2 | require openjdk-8-cross.inc |
3 | 3 | ||
4 | # some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch | ||
5 | # reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html | ||
6 | # by Roman Kennke (rkennke at redhat.com) | ||
7 | PATCHES_URI_append = "\ | ||
8 | file://openjdk8-restrict-to-staging-dir.patch;apply=no \ | ||
9 | file://openjdk8-fix-shark-build.patch;apply=no \ | ||
10 | file://openjdk8-fix-shark-stdc++11.patch;apply=no \ | ||
11 | file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \ | ||
12 | file://openjdk8-fix-adlc-flags.patch;apply=no \ | ||
13 | file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \ | ||
14 | file://openjdk8-fix-zero-mode-crash.patch;apply=no \ | ||
15 | file://openjdk8-add-missing-linker-flags.patch;apply=no \ | ||
16 | " | ||
17 | |||
18 | do_install() { | 4 | do_install() { |
19 | rm -rf ${D}${JDK_HOME} | 5 | rm -rf ${D}${JDK_HOME} |
20 | mkdir -p ${D}${JDK_HOME} | 6 | 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 @@ | |||
1 | require openjdk-8-release-102b14.inc | 1 | require openjdk-8-release-102b14.inc |
2 | require openjdk-8-cross.inc | 2 | require openjdk-8-cross.inc |
3 | 3 | ||
4 | # some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch | ||
5 | # reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html | ||
6 | # by Roman Kennke (rkennke at redhat.com) | ||
7 | PATCHES_URI_append = "\ | ||
8 | file://openjdk8-restrict-to-staging-dir.patch;apply=no \ | ||
9 | file://openjdk8-fix-shark-build.patch;apply=no \ | ||
10 | file://openjdk8-fix-shark-stdc++11.patch;apply=no \ | ||
11 | file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \ | ||
12 | file://openjdk8-fix-adlc-flags.patch;apply=no \ | ||
13 | file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \ | ||
14 | file://openjdk8-fix-zero-mode-crash.patch;apply=no \ | ||
15 | file://openjdk8-add-missing-linker-flags.patch;apply=no \ | ||
16 | " | ||
17 | |||
18 | do_install() { | 4 | do_install() { |
19 | rm -rf ${D}${JRE_HOME} | 5 | rm -rf ${D}${JRE_HOME} |
20 | mkdir -p ${D}${JRE_HOME} | 6 | mkdir -p ${D}${JRE_HOME} |