mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
wxwidgets: Fix locale on musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -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
|
||||
@@ -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://wx-config-fix-libdir-for-multilib.patch \
|
||||
file://0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch \
|
||||
file://musl-locale-l.patch \
|
||||
"
|
||||
SRCREV= "97e99707c5d2271a70cb686720b48dbf34ced496"
|
||||
S = "${WORKDIR}/git"
|
||||
@@ -39,9 +40,6 @@ EXTRA_OECMAKE += " \
|
||||
-DwxUSE_LIBTIFF=sys \
|
||||
-DwxUSE_REGEX=builtin \
|
||||
"
|
||||
EXTRA_OECMAKE:append:libc-musl = " \
|
||||
-DHAVE_LOCALE_T=OFF \
|
||||
"
|
||||
EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"'
|
||||
|
||||
# OpenGL support currently seems tied to using libglu, which requires x11
|
||||
|
||||
Reference in New Issue
Block a user