All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/pipewire: fix uclibc without locale support build
@ 2022-05-21 20:37 James Hilliard
  2022-05-29 21:01 ` Yann E. MORIN
  0 siblings, 1 reply; 2+ messages in thread
From: James Hilliard @ 2022-05-21 20:37 UTC (permalink / raw)
  To: buildroot; +Cc: James Hilliard

Backport a patch fixing uclibc support when locale support is not
enabled.

Fixes:
http://autobuild.buildroot.net/results/658/658ace73425c93dfa34212564d19395c9018f3e6

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 ...ild-on-uclibc-without-locale-support.patch | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 package/pipewire/0001-Fix-build-on-uclibc-without-locale-support.patch

diff --git a/package/pipewire/0001-Fix-build-on-uclibc-without-locale-support.patch b/package/pipewire/0001-Fix-build-on-uclibc-without-locale-support.patch
new file mode 100644
index 0000000000..0f2e6844e5
--- /dev/null
+++ b/package/pipewire/0001-Fix-build-on-uclibc-without-locale-support.patch
@@ -0,0 +1,65 @@
+From 4738c934bbf2a86aa62d752a130d13c524a47696 Mon Sep 17 00:00:00 2001
+From: James Hilliard <james.hilliard1@gmail.com>
+Date: Fri, 20 May 2022 20:18:07 -0600
+Subject: [PATCH] Fix build on uclibc without locale support
+
+When uclibc is build with !UCLIBC_HAS_LOCALE the macro
+__LOCALE_C_ONLY will be set, use this to disable unsupported and
+not required(due to only supporting the C locale) locale functions.
+
+Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
+[james.hilliard1@gmail.com: backport from upstream commit
+4738c934bbf2a86aa62d752a130d13c524a47696]
+---
+ spa/include/spa/utils/string.h | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/spa/include/spa/utils/string.h b/spa/include/spa/utils/string.h
+index 43d19616c..edf4e954f 100644
+--- a/spa/include/spa/utils/string.h
++++ b/spa/include/spa/utils/string.h
+@@ -275,14 +275,20 @@ static inline int spa_scnprintf(char *buffer, size_t size, const char *format, .
+  */
+ static inline float spa_strtof(const char *str, char **endptr)
+ {
++#ifndef __LOCALE_C_ONLY
+ 	static locale_t locale = NULL;
+ 	locale_t prev;
++#endif
+ 	float v;
++#ifndef __LOCALE_C_ONLY
+ 	if (SPA_UNLIKELY(locale == NULL))
+ 		locale = newlocale(LC_ALL_MASK, "C", NULL);
+ 	prev = uselocale(locale);
++#endif
+ 	v = strtof(str, endptr);
++#ifndef __LOCALE_C_ONLY
+ 	uselocale(prev);
++#endif
+ 	return v;
+ }
+ 
+@@ -319,14 +325,20 @@ static inline bool spa_atof(const char *str, float *val)
+  */
+ static inline double spa_strtod(const char *str, char **endptr)
+ {
++#ifndef __LOCALE_C_ONLY
+ 	static locale_t locale = NULL;
+ 	locale_t prev;
++#endif
+ 	double v;
++#ifndef __LOCALE_C_ONLY
+ 	if (SPA_UNLIKELY(locale == NULL))
+ 		locale = newlocale(LC_ALL_MASK, "C", NULL);
+ 	prev = uselocale(locale);
++#endif
+ 	v = strtod(str, endptr);
++#ifndef __LOCALE_C_ONLY
+ 	uselocale(prev);
++#endif
+ 	return v;
+ }
+ 
+-- 
+2.25.1
+
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/pipewire: fix uclibc without locale support build
  2022-05-21 20:37 [Buildroot] [PATCH 1/1] package/pipewire: fix uclibc without locale support build James Hilliard
@ 2022-05-29 21:01 ` Yann E. MORIN
  0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2022-05-29 21:01 UTC (permalink / raw)
  To: James Hilliard; +Cc: buildroot

James, All,

On 2022-05-21 14:37 -0600, James Hilliard spake thusly:
> Backport a patch fixing uclibc support when locale support is not
> enabled.
> 
> Fixes:
> http://autobuild.buildroot.net/results/658/658ace73425c93dfa34212564d19395c9018f3e6
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  ...ild-on-uclibc-without-locale-support.patch | 65 +++++++++++++++++++
>  1 file changed, 65 insertions(+)
>  create mode 100644 package/pipewire/0001-Fix-build-on-uclibc-without-locale-support.patch
> 
> diff --git a/package/pipewire/0001-Fix-build-on-uclibc-without-locale-support.patch b/package/pipewire/0001-Fix-build-on-uclibc-without-locale-support.patch
> new file mode 100644
> index 0000000000..0f2e6844e5
> --- /dev/null
> +++ b/package/pipewire/0001-Fix-build-on-uclibc-without-locale-support.patch
> @@ -0,0 +1,65 @@
> +From 4738c934bbf2a86aa62d752a130d13c524a47696 Mon Sep 17 00:00:00 2001
> +From: James Hilliard <james.hilliard1@gmail.com>
> +Date: Fri, 20 May 2022 20:18:07 -0600
> +Subject: [PATCH] Fix build on uclibc without locale support
> +
> +When uclibc is build with !UCLIBC_HAS_LOCALE the macro
> +__LOCALE_C_ONLY will be set, use this to disable unsupported and
> +not required(due to only supporting the C locale) locale functions.
> +
> +Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> +[james.hilliard1@gmail.com: backport from upstream commit
> +4738c934bbf2a86aa62d752a130d13c524a47696]
> +---
> + spa/include/spa/utils/string.h | 12 ++++++++++++
> + 1 file changed, 12 insertions(+)
> +
> +diff --git a/spa/include/spa/utils/string.h b/spa/include/spa/utils/string.h
> +index 43d19616c..edf4e954f 100644
> +--- a/spa/include/spa/utils/string.h
> ++++ b/spa/include/spa/utils/string.h
> +@@ -275,14 +275,20 @@ static inline int spa_scnprintf(char *buffer, size_t size, const char *format, .
> +  */
> + static inline float spa_strtof(const char *str, char **endptr)
> + {
> ++#ifndef __LOCALE_C_ONLY
> + 	static locale_t locale = NULL;
> + 	locale_t prev;
> ++#endif
> + 	float v;
> ++#ifndef __LOCALE_C_ONLY
> + 	if (SPA_UNLIKELY(locale == NULL))
> + 		locale = newlocale(LC_ALL_MASK, "C", NULL);
> + 	prev = uselocale(locale);
> ++#endif
> + 	v = strtof(str, endptr);
> ++#ifndef __LOCALE_C_ONLY
> + 	uselocale(prev);
> ++#endif
> + 	return v;
> + }
> + 
> +@@ -319,14 +325,20 @@ static inline bool spa_atof(const char *str, float *val)
> +  */
> + static inline double spa_strtod(const char *str, char **endptr)
> + {
> ++#ifndef __LOCALE_C_ONLY
> + 	static locale_t locale = NULL;
> + 	locale_t prev;
> ++#endif
> + 	double v;
> ++#ifndef __LOCALE_C_ONLY
> + 	if (SPA_UNLIKELY(locale == NULL))
> + 		locale = newlocale(LC_ALL_MASK, "C", NULL);
> + 	prev = uselocale(locale);
> ++#endif
> + 	v = strtod(str, endptr);
> ++#ifndef __LOCALE_C_ONLY
> + 	uselocale(prev);
> ++#endif
> + 	return v;
> + }
> + 
> +-- 
> +2.25.1
> +
> -- 
> 2.25.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-29 21:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-21 20:37 [Buildroot] [PATCH 1/1] package/pipewire: fix uclibc without locale support build James Hilliard
2022-05-29 21:01 ` Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.