mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-13 17:39:57 +00:00
Code Issues Projects Releases Wiki Activity

wxwidgets: Fix locale on musl

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2022-12-19 14:44:04 -08:00
parent bdfba1e040
commit b15ce9b591
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch
+32
View File
@@ -0,0 +1,32 @@
these macro'd away functions don't exist in musl (yet)
diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h
index c433d25..3ab9d84 100644
--- a/include/wx/xlocale.h
+++ b/include/wx/xlocale.h
@@ -33,6 +33,26 @@
#include "wx/crt.h" // Includes wx/chartype.h, wx/wxcrt.h(wx/string.h)
#include "wx/intl.h" // wxLanguage
+#ifndef strtol_l
+#define strtol_l(s, p, base, l) strtol(s, p, base)
+#endif
+
+#ifndef strtoul_l
+#define strtoul_l(s, p, base, l) strtoul(s, p, base)
+#endif
+
+#ifndef wcstod_l
+#define wcstod_l(s, p, l) wcstod(s, p)
+#endif
+
+#ifndef wcstol_l
+#define wcstol_l(s, p, base, l) wcstol(s, p, base)
+#endif
+
+#ifndef wcstoul_l
+#define wcstoul_l(s, p, base, l) wcstoul(s, p, base)
+#endif
+
// The platform-specific locale type
// If wxXLocale_t is not defined, then only "C" locale support is provided
#ifdef wxHAS_XLOCALE_SUPPORT
meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb
+1 -3
View File
@@ -25,6 +25,7 @@ SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https
file://not-append-system-name-to-lib-name.patch \ file://not-append-system-name-to-lib-name.patch \
file://wx-config-fix-libdir-for-multilib.patch \ file://wx-config-fix-libdir-for-multilib.patch \
file://0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch \ file://0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch \
file://musl-locale-l.patch \
" "
SRCREV= "97e99707c5d2271a70cb686720b48dbf34ced496" SRCREV= "97e99707c5d2271a70cb686720b48dbf34ced496"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
@@ -39,9 +40,6 @@ EXTRA_OECMAKE += " \
-DwxUSE_LIBTIFF=sys \ -DwxUSE_LIBTIFF=sys \
-DwxUSE_REGEX=builtin \ -DwxUSE_REGEX=builtin \
" "
EXTRA_OECMAKE:append:libc-musl = " \
-DHAVE_LOCALE_T=OFF \
"
EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"' EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"'
# OpenGL support currently seems tied to using libglu, which requires x11 # OpenGL support currently seems tied to using libglu, which requires x11