summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-12-18 15:00:02 -0800
committerKhem Raj <raj.khem@gmail.com>2022-12-27 09:55:19 -0800
commitbdfba1e04020bbfb47aba0a6ca12c1faf4403f5d (patch)
tree77a4c717f4a2db40220ac8784407ba765bb224b2
parent4da7554d81e839f0c788e2c1c1eab817c02cf114 (diff)
downloadmeta-openembedded-bdfba1e04020bbfb47aba0a6ca12c1faf4403f5d.tar.gz
wxwidgets: Fix build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch26
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb16
2 files changed, 34 insertions, 8 deletions
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 @@
1From 72c3b7324f00047e6dc5d8380ed2f6ff2494a6f9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 18 Dec 2022 14:51:34 -0800
4Subject: [PATCH] locale: Avoid using glibc specific defines on musl
5
6musl does not provide some glibc-only enum members e.g. _NL_ADDRESS_LANG_NAME
7
8Upstream-Status: Submitted [https://github.com/wxWidgets/wxWidgets/pull/23050]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 src/unix/uilocale.cpp | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/src/unix/uilocale.cpp b/src/unix/uilocale.cpp
15index 57773e17f5..86816ba896 100644
16--- a/src/unix/uilocale.cpp
17+++ b/src/unix/uilocale.cpp
18@@ -619,7 +619,7 @@ wxString
19 wxUILocaleImplUnix::GetLocalizedName(wxLocaleName name, wxLocaleForm form) const
20 {
21 wxString str;
22-#if defined(HAVE_LANGINFO_H) && defined(__LINUX__)
23+#if defined(HAVE_LANGINFO_H) && defined(__LINUX__) && defined(__GLIBC__)
24 switch (name)
25 {
26 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 += " \
18 tiff \ 18 tiff \
19" 19"
20 20
21SRC_URI = " \ 21SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https \
22 gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https \ 22 file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \
23 file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ 23 file://fix-libdir-for-multilib.patch \
24 file://fix-libdir-for-multilib.patch \ 24 file://create-links-with-relative-path.patch \
25 file://create-links-with-relative-path.patch \ 25 file://not-append-system-name-to-lib-name.patch \
26 file://not-append-system-name-to-lib-name.patch \ 26 file://wx-config-fix-libdir-for-multilib.patch \
27 file://wx-config-fix-libdir-for-multilib.patch \ 27 file://0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch \
28" 28 "
29SRCREV= "97e99707c5d2271a70cb686720b48dbf34ced496" 29SRCREV= "97e99707c5d2271a70cb686720b48dbf34ced496"
30S = "${WORKDIR}/git" 30S = "${WORKDIR}/git"
31 31