Skip to content

Commit

Permalink
gcc: don't throw exception on locales other than "C" on musl.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
ericonr authored and q66 committed Feb 18, 2021
1 parent fc1d31c commit d4a9feb
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
16 changes: 16 additions & 0 deletions 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
2 changes: 1 addition & 1 deletion srcpkgs/gcc/template
Expand Up @@ -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"
Expand Down

0 comments on commit d4a9feb

Please sign in to comment.