diff options
| author | Marius Bakke <marius@gnu.org> | 2020-05-26 22:30:51 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-05-26 22:30:51 +0200 |
| commit | 9edb3f66fd807b096b48283debdcddccfea34bad (patch) | |
| tree | cfd86f44ad51df4341a0d48cf4978117e11d7f59 /gnu/packages/patches/musl-cross-locale.patch | |
| parent | e5f95fd897ad32c93bb48ceae30021976a917979 (diff) | |
| parent | b6d18fbdf6ab4a8821a58aa16587676e835001f2 (diff) | |
| download | guix-9edb3f66fd807b096b48283debdcddccfea34bad.tar guix-9edb3f66fd807b096b48283debdcddccfea34bad.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/musl-cross-locale.patch')
| -rw-r--r-- | gnu/packages/patches/musl-cross-locale.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/gnu/packages/patches/musl-cross-locale.patch b/gnu/packages/patches/musl-cross-locale.patch new file mode 100644 index 0000000000..7634eda381 --- /dev/null +++ b/gnu/packages/patches/musl-cross-locale.patch @@ -0,0 +1,20 @@ +Disable locales other than C and POSIX because of a compilation error. +By Danny Milosavljevic <dannym@scratchpost.org> +This patch is distributed under BSD-3 license. +See https://github.com/osresearch/heads/pull/610 +diff -ruN b/source/patches/gcc-5.3.0-locale.diff guix-build-musl-cross-0.1-3.a8a6649.drv-12/source/patches/gcc-5.3.0-locale.diff +--- a/patches/gcc-5.3.0-locale.diff 1970-01-01 01:00:00.000000000 +0100 ++++ b/patches/gcc-5.3.0-locale.diff 2020-05-02 14:20:47.213564509 +0200 +@@ -0,0 +1,12 @@ ++--- gcc-5.3.0/libstdc++-v3/config/locale/gnu/ctype_members.cc.orig 2020-05-02 14:16:31.376147000 +0200 +++++ gcc-5.3.0/libstdc++-v3/config/locale/gnu/ctype_members.cc 2020-05-02 14:16:56.716279576 +0200 ++@@ -47,7 +47,8 @@ ++ this->_S_create_c_locale(this->_M_c_locale_ctype, __s); ++ this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper; ++ this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower; ++- this->_M_table = this->_M_c_locale_ctype->__ctype_b; +++ //this->_M_table = this->_M_c_locale_ctype->__ctype_b; +++ throw 3; ++ } ++ } ++ |