diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb index e821430406..6b57cb54cb 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb @@ -24,6 +24,7 @@ SRC_URI = " \ file://fix-libdir-for-multilib.patch \ file://respect-DESTDIR-when-create-link.patch \ file://not-append-system-name-to-lib-name.patch \ + file://wx-config-fix-libdir-for-multilib.patch \ " SRCREV= "9c0a8be1dc32063d91ed1901fd5fcd54f4f955a1" S = "${WORKDIR}/git" @@ -42,10 +43,11 @@ EXTRA_OECMAKE += " \ EXTRA_OECMAKE:append:libc-musl = " \ -DHAVE_LOCALE_T=OFF \ " +EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"' -# All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake) -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', 'no_gui', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ +# OpenGL support currently seems tied to using libglu, which requires x11 +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \ " PACKAGECONFIG:remove:class-native = "opengl" @@ -113,4 +115,6 @@ FILES:${PN}-dev += " \ ${libdir}/wx/config/ \ " +RDEPENDS:${PN}-dev += "grep" + BBCLASSEXTEND = "native" |