* [meta-java][PATCH] classpath-native and friends: inherit native last
@ 2021-02-05 3:58 Douglas
2021-02-05 7:48 ` [oe] " Richard Leitner
0 siblings, 1 reply; 2+ messages in thread
From: Douglas @ 2021-02-05 3:58 UTC (permalink / raw)
To: openembedded-devel; +Cc: Douglas Royds
Fixes QA Issue: classpath-native: native/nativesdk class is not inherited last
Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
---
recipes-core/cacao/cacao-initial-native_0.98.bb | 2 +-
recipes-core/classpath/classpath-native.inc | 2 +-
recipes-core/ecj/libecj-bootstrap.inc | 2 +-
recipes-core/icedtea/icedtea7-native.inc | 3 ++-
recipes-core/jamvm/jamvm-initial-native_1.4.5.bb | 2 +-
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"
PROVIDES = "virtual/java-initial-native"
-inherit native autotools-brokensep
+inherit autotools-brokensep native
DEPENDS = "zlib-native libtool-native fastjar-native classpath-initial-native jikes-initial-native"
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"
DEPENDS = "fastjar-native zip-native"
-inherit autotools native gettext
+inherit autotools gettext native
SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
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/
INC_PR = "r5"
-inherit native java
+inherit java native
S = "${WORKDIR}"
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
# Explicitly pass -fcommon since GCC 10 defaults to -fno-common for C sources
CFLAGS_append = " -fcommon"
-inherit native java autotools pkgconfig
+inherit java autotools pkgconfig
inherit openjdk-build-helper
inherit python3native
+inherit native
JAVA_HOME[unexport] = "1"
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 \
# This uses 32 bit arm, so force the instruction set to arm, not thumb
ARM_INSTRUCTION_SET = "arm"
-inherit native autotools pkgconfig
+inherit autotools pkgconfig native
# libdir must be modified so that jamvm-initial and -native
# 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 = "\
"
# --with-boot-jdk=${WORKDIR}/fake-jdk
-inherit native
-
require openjdk-8-common.inc
+inherit native
+
CFLAGS_append = " ${@jdk_cpp_options(d)}"
CPPFLAGS_append = "${@jdk_cpp_options(d)}"
CXXFLAGS_append = " ${@jdk_cpp_options(d)}"
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [oe] [meta-java][PATCH] classpath-native and friends: inherit native last
2021-02-05 3:58 [meta-java][PATCH] classpath-native and friends: inherit native last Douglas
@ 2021-02-05 7:48 ` Richard Leitner
0 siblings, 0 replies; 2+ messages in thread
From: Richard Leitner @ 2021-02-05 7:48 UTC (permalink / raw)
To: douglas.royds; +Cc: openembedded-devel
Hi Douglas,
thanks for you patch!
I will review/test it in the comming days and give feedback!
regards;rl
On Fri, Feb 05, 2021 at 04:58:46PM +1300, Douglas via lists.openembedded.org wrote:
> Fixes QA Issue: classpath-native: native/nativesdk class is not inherited last
>
> Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
> ---
> recipes-core/cacao/cacao-initial-native_0.98.bb | 2 +-
> recipes-core/classpath/classpath-native.inc | 2 +-
> recipes-core/ecj/libecj-bootstrap.inc | 2 +-
> recipes-core/icedtea/icedtea7-native.inc | 3 ++-
> recipes-core/jamvm/jamvm-initial-native_1.4.5.bb | 2 +-
> 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"
>
> PROVIDES = "virtual/java-initial-native"
>
> -inherit native autotools-brokensep
> +inherit autotools-brokensep native
>
> DEPENDS = "zlib-native libtool-native fastjar-native classpath-initial-native jikes-initial-native"
>
> 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"
>
> DEPENDS = "fastjar-native zip-native"
>
> -inherit autotools native gettext
> +inherit autotools gettext native
>
> SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
>
> 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/
>
> INC_PR = "r5"
>
> -inherit native java
> +inherit java native
>
> S = "${WORKDIR}"
>
> 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
> # Explicitly pass -fcommon since GCC 10 defaults to -fno-common for C sources
> CFLAGS_append = " -fcommon"
>
> -inherit native java autotools pkgconfig
> +inherit java autotools pkgconfig
> inherit openjdk-build-helper
> inherit python3native
> +inherit native
>
> JAVA_HOME[unexport] = "1"
>
> 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 \
> # This uses 32 bit arm, so force the instruction set to arm, not thumb
> ARM_INSTRUCTION_SET = "arm"
>
> -inherit native autotools pkgconfig
> +inherit autotools pkgconfig native
>
> # libdir must be modified so that jamvm-initial and -native
> # 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 = "\
> "
> # --with-boot-jdk=${WORKDIR}/fake-jdk
>
> -inherit native
> -
> require openjdk-8-common.inc
>
> +inherit native
> +
> CFLAGS_append = " ${@jdk_cpp_options(d)}"
> CPPFLAGS_append = "${@jdk_cpp_options(d)}"
> CXXFLAGS_append = " ${@jdk_cpp_options(d)}"
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-05 7:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-05 3:58 [meta-java][PATCH] classpath-native and friends: inherit native last Douglas
2021-02-05 7:48 ` [oe] " Richard Leitner
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.