diff options
author | Douglas Royds <douglas.royds@taitradio.com> | 2021-02-05 16:58:46 +1300 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2021-02-21 07:54:42 +0100 |
commit | 2cf23656eddbf77ac0ce78f7840f8f40e18199f4 (patch) | |
tree | 6def60dc5f97475f5bfcaa90df2aa475a66389a1 | |
parent | a5257d41f32812bc9426183cc8d2b6f07617b0d5 (diff) | |
download | meta-java-2cf23656eddbf77ac0ce78f7840f8f40e18199f4.tar.gz |
classpath-native and friends: inherit native last
Fixes QA Issue: classpath-native: native/nativesdk class is not inherited last
Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
-rw-r--r-- | recipes-core/cacao/cacao-initial-native_0.98.bb | 2 | ||||
-rw-r--r-- | recipes-core/classpath/classpath-native.inc | 2 | ||||
-rw-r--r-- | recipes-core/ecj/libecj-bootstrap.inc | 2 | ||||
-rw-r--r-- | recipes-core/icedtea/icedtea7-native.inc | 3 | ||||
-rw-r--r-- | recipes-core/jamvm/jamvm-initial-native_1.4.5.bb | 2 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-native.inc | 4 |
6 files changed, 8 insertions, 7 deletions
diff --git a/recipes-core/cacao/cacao-initial-native_0.98.bb b/recipes-core/cacao/cacao-initial-native_0.98.bb index 8125e88..a43d3f4 100644 --- a/recipes-core/cacao/cacao-initial-native_0.98.bb +++ b/recipes-core/cacao/cacao-initial-native_0.98.bb | |||
@@ -6,7 +6,7 @@ SECTION = "interpreters" | |||
6 | 6 | ||
7 | PROVIDES = "virtual/java-initial-native" | 7 | PROVIDES = "virtual/java-initial-native" |
8 | 8 | ||
9 | inherit native autotools-brokensep | 9 | inherit autotools-brokensep native |
10 | 10 | ||
11 | DEPENDS = "zlib-native libtool-native fastjar-native classpath-initial-native jikes-initial-native" | 11 | DEPENDS = "zlib-native libtool-native fastjar-native classpath-initial-native jikes-initial-native" |
12 | 12 | ||
diff --git a/recipes-core/classpath/classpath-native.inc b/recipes-core/classpath/classpath-native.inc index b1de458..c81e064 100644 --- a/recipes-core/classpath/classpath-native.inc +++ b/recipes-core/classpath/classpath-native.inc | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" | |||
5 | 5 | ||
6 | DEPENDS = "fastjar-native zip-native" | 6 | DEPENDS = "fastjar-native zip-native" |
7 | 7 | ||
8 | inherit autotools native gettext | 8 | inherit autotools gettext native |
9 | 9 | ||
10 | SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" | 10 | SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" |
11 | 11 | ||
diff --git a/recipes-core/ecj/libecj-bootstrap.inc b/recipes-core/ecj/libecj-bootstrap.inc index 04425f4..8f84fd0 100644 --- a/recipes-core/ecj/libecj-bootstrap.inc +++ b/recipes-core/ecj/libecj-bootstrap.inc | |||
@@ -9,7 +9,7 @@ DEPENDS = "classpath-initial-native fastjar-native jikes-initial-native virtual/ | |||
9 | 9 | ||
10 | INC_PR = "r5" | 10 | INC_PR = "r5" |
11 | 11 | ||
12 | inherit native java | 12 | inherit java native |
13 | 13 | ||
14 | S = "${WORKDIR}" | 14 | S = "${WORKDIR}" |
15 | 15 | ||
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index 5351fe1..f53715f 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc | |||
@@ -36,9 +36,10 @@ CFLAGS_append = " ${@oe.utils.conditional('HOST_COMPILER_MAJOR', '9', '-Wno-erro | |||
36 | # Explicitly pass -fcommon since GCC 10 defaults to -fno-common for C sources | 36 | # Explicitly pass -fcommon since GCC 10 defaults to -fno-common for C sources |
37 | CFLAGS_append = " -fcommon" | 37 | CFLAGS_append = " -fcommon" |
38 | 38 | ||
39 | inherit native java autotools pkgconfig | 39 | inherit java autotools pkgconfig |
40 | inherit openjdk-build-helper | 40 | inherit openjdk-build-helper |
41 | inherit python3native | 41 | inherit python3native |
42 | inherit native | ||
42 | 43 | ||
43 | JAVA_HOME[unexport] = "1" | 44 | JAVA_HOME[unexport] = "1" |
44 | 45 | ||
diff --git a/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb b/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb index bf005db..1f5921f 100644 --- a/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb +++ b/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ | |||
20 | # This uses 32 bit arm, so force the instruction set to arm, not thumb | 20 | # This uses 32 bit arm, so force the instruction set to arm, not thumb |
21 | ARM_INSTRUCTION_SET = "arm" | 21 | ARM_INSTRUCTION_SET = "arm" |
22 | 22 | ||
23 | inherit native autotools pkgconfig | 23 | inherit autotools pkgconfig native |
24 | 24 | ||
25 | # libdir must be modified so that jamvm-initial and -native | 25 | # libdir must be modified so that jamvm-initial and -native |
26 | # do not interfere | 26 | # do not interfere |
diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc index 92d9473..3282257 100644 --- a/recipes-core/openjdk/openjdk-8-native.inc +++ b/recipes-core/openjdk/openjdk-8-native.inc | |||
@@ -32,10 +32,10 @@ EXTRA_OECONF_append = "\ | |||
32 | " | 32 | " |
33 | # --with-boot-jdk=${WORKDIR}/fake-jdk | 33 | # --with-boot-jdk=${WORKDIR}/fake-jdk |
34 | 34 | ||
35 | inherit native | ||
36 | |||
37 | require openjdk-8-common.inc | 35 | require openjdk-8-common.inc |
38 | 36 | ||
37 | inherit native | ||
38 | |||
39 | CFLAGS_append = " ${@jdk_cpp_options(d)}" | 39 | CFLAGS_append = " ${@jdk_cpp_options(d)}" |
40 | CPPFLAGS_append = "${@jdk_cpp_options(d)}" | 40 | CPPFLAGS_append = "${@jdk_cpp_options(d)}" |
41 | CXXFLAGS_append = " ${@jdk_cpp_options(d)}" | 41 | CXXFLAGS_append = " ${@jdk_cpp_options(d)}" |