summaryrefslogtreecommitdiffstats
path: root/recipes-extended
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2018-11-17 09:57:38 +0000
committerRichard Leitner <richard.leitner@skidata.com>2018-12-18 16:05:15 +0100
commitb0c74493af1415dfd3b6caf77ebc677ed4e0fdaa (patch)
treea750e954399cd8b5501417859be6f11dfe23951c /recipes-extended
parent6b404a3202963d45919c37ebe7e32910a29364b9 (diff)
downloadmeta-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>
Diffstat (limited to 'recipes-extended')
-rw-r--r--recipes-extended/rxtx/rxtx_2.2.0.bb2
1 files changed, 1 insertions, 1 deletions
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
29INSANE_SKIP_${JPN} += "dev-so" 29INSANE_SKIP_${JPN} += "dev-so"
30 30
31inherit autotools-brokensep java-library remove-libtool
32PACKAGE_ARCH = "${TUNE_PKGARCH}" 31PACKAGE_ARCH = "${TUNE_PKGARCH}"
32inherit autotools-brokensep java-library remove-libtool
33 33
34JARFILENAME = "RXTXcomm.jar" 34JARFILENAME = "RXTXcomm.jar"
35EXTRA_OEMAKE += "RXTX_PATH=${D}${libdir_jni} \ 35EXTRA_OEMAKE += "RXTX_PATH=${D}${libdir_jni} \