diff options
author | André Draszik <andre.draszik@jci.com> | 2018-11-17 09:57:38 +0000 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2018-12-18 16:05:15 +0100 |
commit | b0c74493af1415dfd3b6caf77ebc677ed4e0fdaa (patch) | |
tree | a750e954399cd8b5501417859be6f11dfe23951c | |
parent | 6b404a3202963d45919c37ebe7e32910a29364b9 (diff) | |
download | meta-java-b0c74493af1415dfd3b6caf77ebc677ed4e0fdaa.tar.gz |
java-library: make packages overriding PACKAGE_ARCH work again
Recent changes is OE have caused the traditional approach of inheriting
allarch and setting PACKAGE_ARCH not work anymore. Once allarch is
inherited, PACKAGE_ARCH can not be overridden afterwards.
See commit a23c482cab4f ("allarch: only enable allarch when multilib
is not used") d9ba0219b2f6 in poky.
http://git.openembedded.org/openembedded-core/commit/?id=a23c482cab4f874f4a6a6889716123569eb5ece9
The error manifests itself with configure trying to
--host=allarch-poky-linux --target=allarch-poky-linux
which fails.
To work around this we can make java-library's allarch inherit
conditional, as is done e.g. in OE-core for packagegroup.bbclass
http://git.openembedded.org/openembedded-core/commit/?id=9c826962ec8fa45c2b035427442b90a41517144e
http://git.openembedded.org/openembedded-core/commit/?id=2c9b1d304daade7b0907320aeb9c522e7ab9dcab
So this commit does exactly that, and fixes the two users of this to
follow the new approach.
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
-rw-r--r-- | classes/java-library.bbclass | 8 | ||||
-rw-r--r-- | recipes-core/libmatthew/libmatthew.inc | 2 | ||||
-rw-r--r-- | recipes-extended/rxtx/rxtx_2.2.0.bb | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass index ce1cd28..e0159ba 100644 --- a/classes/java-library.bbclass +++ b/classes/java-library.bbclass | |||
@@ -10,9 +10,13 @@ | |||
10 | # | 10 | # |
11 | # package archs are set to all, if the recipe builds also packages which | 11 | # package archs are set to all, if the recipe builds also packages which |
12 | # can not be used for all archs, then set the PACKAGE_ARCH of that package | 12 | # can not be used for all archs, then set the PACKAGE_ARCH of that package |
13 | # manually, see rxtx_xx.bb for an example. | 13 | # manually *before* inheriting the class, see rxtx_xx.bb for an example. |
14 | 14 | ||
15 | inherit java allarch | 15 | inherit java |
16 | PACKAGE_ARCH ?= "all" | ||
17 | # Fully expanded - so it applies the overrides as well | ||
18 | PACKAGE_ARCH_EXPANDED := "${PACKAGE_ARCH}" | ||
19 | inherit ${@oe.utils.ifelse(d.getVar('PACKAGE_ARCH_EXPANDED') == 'all', 'allarch', '')} | ||
16 | 20 | ||
17 | # use java_stage for native packages | 21 | # use java_stage for native packages |
18 | JAVA_NATIVE_STAGE_INSTALL = "1" | 22 | JAVA_NATIVE_STAGE_INSTALL = "1" |
diff --git a/recipes-core/libmatthew/libmatthew.inc b/recipes-core/libmatthew/libmatthew.inc index 7db979b..2119c0b 100644 --- a/recipes-core/libmatthew/libmatthew.inc +++ b/recipes-core/libmatthew/libmatthew.inc | |||
@@ -7,8 +7,8 @@ DEPENDS = "virtual/java-native classpath-native classpath" | |||
7 | 7 | ||
8 | S = "${WORKDIR}/libmatthew-java-${PV}" | 8 | S = "${WORKDIR}/libmatthew-java-${PV}" |
9 | 9 | ||
10 | inherit java-library | ||
11 | PACKAGE_ARCH = "${TUNE_PKGARCH}" | 10 | PACKAGE_ARCH = "${TUNE_PKGARCH}" |
11 | inherit java-library | ||
12 | 12 | ||
13 | # Some internal version numbers which change from time to time. | 13 | # Some internal version numbers which change from time to time. |
14 | # Allowing to override them makes this include file more | 14 | # Allowing to override them makes this include file more |
diff --git a/recipes-extended/rxtx/rxtx_2.2.0.bb b/recipes-extended/rxtx/rxtx_2.2.0.bb index e54dad7..d4fbb9d 100644 --- a/recipes-extended/rxtx/rxtx_2.2.0.bb +++ b/recipes-extended/rxtx/rxtx_2.2.0.bb | |||
@@ -28,8 +28,8 @@ S = "${WORKDIR}/rxtx-2.2pre2" | |||
28 | 28 | ||
29 | INSANE_SKIP_${JPN} += "dev-so" | 29 | INSANE_SKIP_${JPN} += "dev-so" |
30 | 30 | ||
31 | inherit autotools-brokensep java-library remove-libtool | ||
32 | PACKAGE_ARCH = "${TUNE_PKGARCH}" | 31 | PACKAGE_ARCH = "${TUNE_PKGARCH}" |
32 | inherit autotools-brokensep java-library remove-libtool | ||
33 | 33 | ||
34 | JARFILENAME = "RXTXcomm.jar" | 34 | JARFILENAME = "RXTXcomm.jar" |
35 | EXTRA_OEMAKE += "RXTX_PATH=${D}${libdir_jni} \ | 35 | EXTRA_OEMAKE += "RXTX_PATH=${D}${libdir_jni} \ |