diff options
author | Ryan Eatmon <reatmon@ti.com> | 2024-01-18 12:40:02 -0600 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2024-01-23 21:32:32 -0300 |
commit | 1ff6fdcfb971e0b5bfd037b937378fc1937b740b (patch) | |
tree | 20a4bc38c3775539864cf661be1a8d4388fa2984 | |
parent | 526b61e10908f733701c2bf0e4db629b428c0384 (diff) |
qmake5: Move to EXPORT_FUNCTIONS
A recent change in bitbake [1] has caused a build failure in qtwebkit.
The fix with how the EXPORT_FUNCTIONS is being handled means that it
is running into a collision with the explicit do_configure defined in this
file.
This fix moves the explicit do_configure and do_insatll to use the
EXPORT_FUNCTIONS methodology so that the conflict is resolved correctly.
[1] https://git.openembedded.org/bitbake/commit/?id=66306d5151acb0a26a171c338d8f60eb9eb16c6b
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | classes/qmake5.bbclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index befb5bfd..d9b919cd 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -6,14 +6,16 @@ inherit qmake5_base QT5TOOLSDEPENDS ?= "qtbase-native" DEPENDS:prepend = "${QT5TOOLSDEPENDS} " -do_configure() { +qmake5_do_configure() { qmake5_base_do_configure } -do_install() { +qmake5_do_install() { qmake5_base_do_install } -do_install:class-native() { +qmake5_do_install:class-native() { qmake5_base_native_do_install } + +EXPORT_FUNCTIONS do_configure do_install |