Signed-off-by: Khem Raj <[email protected]> --- ...using-glibc-specific-defines-on-musl.patch | 26 +++++++++++++++++++ .../wxwidgets/wxwidgets_3.2.1.bb | 16 ++++++------ 2 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch new file mode 100644 index 0000000000..52f4449339 --- /dev/null +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch @@ -0,0 +1,26 @@ +From 72c3b7324f00047e6dc5d8380ed2f6ff2494a6f9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 18 Dec 2022 14:51:34 -0800 +Subject: [PATCH] locale: Avoid using glibc specific defines on musl + +musl does not provide some glibc-only enum members e.g. _NL_ADDRESS_LANG_NAME + +Upstream-Status: Submitted [https://github.com/wxWidgets/wxWidgets/pull/23050] +Signed-off-by: Khem Raj <[email protected]> +--- + src/unix/uilocale.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/unix/uilocale.cpp b/src/unix/uilocale.cpp +index 57773e17f5..86816ba896 100644 +--- a/src/unix/uilocale.cpp ++++ b/src/unix/uilocale.cpp +@@ -619,7 +619,7 @@ wxString + wxUILocaleImplUnix::GetLocalizedName(wxLocaleName name, wxLocaleForm form) const + { + wxString str; +-#if defined(HAVE_LANGINFO_H) && defined(__LINUX__) ++#if defined(HAVE_LANGINFO_H) && defined(__LINUX__) && defined(__GLIBC__) + switch (name) + { + case wxLOCALE_NAME_LOCALE: diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb index 7f0d27123f..03a75d8bd3 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb @@ -18,14 +18,14 @@ DEPENDS += " \ tiff \ " -SRC_URI = " \ - gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https \ - file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ - file://fix-libdir-for-multilib.patch \ - file://create-links-with-relative-path.patch \ - file://not-append-system-name-to-lib-name.patch \ - file://wx-config-fix-libdir-for-multilib.patch \ -" +SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https \ + file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ + file://fix-libdir-for-multilib.patch \ + file://create-links-with-relative-path.patch \ + file://not-append-system-name-to-lib-name.patch \ + file://wx-config-fix-libdir-for-multilib.patch \ + file://0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch \ + " SRCREV= "97e99707c5d2271a70cb686720b48dbf34ced496" S = "${WORKDIR}/git" -- 2.39.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100091): https://lists.openembedded.org/g/openembedded-devel/message/100091 Mute This Topic: https://lists.openembedded.org/mt/95760885/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
