[PR PATCH] gcc: don't throw exception on locales other than "C" on musl.

[PR PATCH] gcc: don't throw exception on locales other than "C" on musl.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 2047 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages loc
https://github.com/void-linux/void-packages/pull/28773

gcc: don't throw exception on locales other than "C" on musl.
libtsdc++'s generic locale implementation is stuck in ~2003,
unfortunately, and just throws an exception if locales other than "C"
are used. Some applications catch this error, but they shouldn't have
to, so we will import a patch to disable the exception. It is a
workaround, and the best solution is adding a proper generic
implementation to libstdc++.

Fixes #18659

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
- [ ] currently building and will test in a bit

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/28773.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-loc-28773.patch --]
[-- Type: text/x-diff, Size: 2229 bytes --]

From b98f90aff1f6e062cd39ba1d8a917fd6dab9fd90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 15 Feb 2021 03:01:15 -0300
Subject: [PATCH] gcc: don't throw exception on locales other than "C" on musl.

libtsdc++'s generic locale implementation is stuck in ~2003,
unfortunately, and just throws an exception if locales other than "C"
are used. Some applications catch this error, but they shouldn't have
to, so we will import a patch to disable the exception. It is a
workaround, and the best solution is adding a proper generic
implementation to libstdc++.

Fixes #18659
---
 srcpkgs/gcc/patches/musl-generic-locale.patch | 16 ++++++++++++++++
 srcpkgs/gcc/template                          |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gcc/patches/musl-generic-locale.patch

diff --git a/srcpkgs/gcc/patches/musl-generic-locale.patch b/srcpkgs/gcc/patches/musl-generic-locale.patch
new file mode 100644
index 00000000000..9f459d0d9ba
--- /dev/null
+++ b/srcpkgs/gcc/patches/musl-generic-locale.patch
@@ -0,0 +1,16 @@
+See
+https://inbox.vuxu.org/musl/551d3310-039f-23c4-608e-5e15e625f638@sholland.org/
+
+diff --git gcc-5.4.0/libstdc++-v3/config/locale/generic/c_locale.cc.orig gcc-5.4.0/libstdc++-v3/config/locale/generic/c_locale.cc
+--- libstdc++-v3/config/locale/generic/c_locale.cc.orig
++++ libstdc++-v3/config/locale/generic/c_locale.cc
+@@ -213,9 +213,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+     // Currently, the generic model only supports the "C" locale.
+     // See http://gcc.gnu.org/ml/libstdc++/2003-02/msg00345.html
+     __cloc = 0;
+-    if (strcmp(__s, "C"))
+-      __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
+-			    "name not valid"));
+   }
+ 
+   void
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index c838403941c..ba708493485 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -15,7 +15,7 @@ pkgname=gcc
 # it should be possible to switch back to stable with 10.3 or 11
 version=${_patchver}pre1
 wrksrc=gcc-${version/pre/_pre}
-revision=2
+revision=3
 short_desc="GNU Compiler Collection"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="http://gcc.gnu.org"

Re: gcc: don't throw exception on locales other than "C" on musl.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28773#issuecomment-779255281

Comment:
Works here, will merge unless we find something else to include in a gcc bump.

Re: [PR PATCH] [Merged]: gcc: don't throw exception on locales other than "C" on musl.

[q66]

[-- Attachment #1: Type: text/plain, Size: 1900 bytes --]

There's a merged pull request on the void-packages repository

gcc: don't throw exception on locales other than "C" on musl.
https://github.com/void-linux/void-packages/pull/28773

Description:
libtsdc++'s generic locale implementation is stuck in ~2003,
unfortunately, and just throws an exception if locales other than "C"
are used. Some applications catch this error, but they shouldn't have
to, so we will import a patch to disable the exception. It is a
workaround, and the best solution is adding a proper generic
implementation to libstdc++.

Fixes #18659

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
- [x] currently building and will test in a bit

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->