summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas Royds <douglas.royds@taitradio.com>2021-02-05 16:58:46 +1300
committerRichard Leitner <richard.leitner@skidata.com>2021-02-21 07:54:42 +0100
commit2cf23656eddbf77ac0ce78f7840f8f40e18199f4 (patch)
tree6def60dc5f97475f5bfcaa90df2aa475a66389a1
parenta5257d41f32812bc9426183cc8d2b6f07617b0d5 (diff)
downloadmeta-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.bb2
-rw-r--r--recipes-core/classpath/classpath-native.inc2
-rw-r--r--recipes-core/ecj/libecj-bootstrap.inc2
-rw-r--r--recipes-core/icedtea/icedtea7-native.inc3
-rw-r--r--recipes-core/jamvm/jamvm-initial-native_1.4.5.bb2
-rw-r--r--recipes-core/openjdk/openjdk-8-native.inc4
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
7PROVIDES = "virtual/java-initial-native" 7PROVIDES = "virtual/java-initial-native"
8 8
9inherit native autotools-brokensep 9inherit autotools-brokensep native
10 10
11DEPENDS = "zlib-native libtool-native fastjar-native classpath-initial-native jikes-initial-native" 11DEPENDS = "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
6DEPENDS = "fastjar-native zip-native" 6DEPENDS = "fastjar-native zip-native"
7 7
8inherit autotools native gettext 8inherit autotools gettext native
9 9
10SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" 10SRC_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
10INC_PR = "r5" 10INC_PR = "r5"
11 11
12inherit native java 12inherit java native
13 13
14S = "${WORKDIR}" 14S = "${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
37CFLAGS_append = " -fcommon" 37CFLAGS_append = " -fcommon"
38 38
39inherit native java autotools pkgconfig 39inherit java autotools pkgconfig
40inherit openjdk-build-helper 40inherit openjdk-build-helper
41inherit python3native 41inherit python3native
42inherit native
42 43
43JAVA_HOME[unexport] = "1" 44JAVA_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
21ARM_INSTRUCTION_SET = "arm" 21ARM_INSTRUCTION_SET = "arm"
22 22
23inherit native autotools pkgconfig 23inherit 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
35inherit native
36
37require openjdk-8-common.inc 35require openjdk-8-common.inc
38 36
37inherit native
38
39CFLAGS_append = " ${@jdk_cpp_options(d)}" 39CFLAGS_append = " ${@jdk_cpp_options(d)}"
40CPPFLAGS_append = "${@jdk_cpp_options(d)}" 40CPPFLAGS_append = "${@jdk_cpp_options(d)}"
41CXXFLAGS_append = " ${@jdk_cpp_options(d)}" 41CXXFLAGS_append = " ${@jdk_cpp_options(d)}"