alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

glibc: fix cross compilation build failure

Browse source
This commit is contained in:
Andrew Childs 2020-01-06 23:36:40 +09:00
parent 569f05222c
commit 51014768d2
3 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/libraries/glibc/common.nix
View file

@ -97,6 +97,11 @@ stdenv.mkDerivation ({
./CVE-2018-11236.patch ./CVE-2018-11236.patch
# https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f51c8367685dc888a02f7304c729ed5277904aff # https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f51c8367685dc888a02f7304c729ed5277904aff
./CVE-2018-11237.patch ./CVE-2018-11237.patch
# Remove after upgrading to glibc 2.28+
# Change backported from upstream
# https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9c79cec8cd2a6996a73aa83d79b360ffd4bebde6
./fix-out-of-bounds-access-in-findidxwc.patch
] ]
++ lib.optionals stdenv.isx86_64 [ ++ lib.optionals stdenv.isx86_64 [
./fix-x64-abi.patch ./fix-x64-abi.patch

5
pkgs/development/libraries/glibc/default.nix
View file

@ -54,6 +54,11 @@ callPackage ./common.nix { inherit stdenv; } {
# Fix -Werror build failure when building glibc with musl with GCC >= 8, see: # Fix -Werror build failure when building glibc with musl with GCC >= 8, see:
# https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798 # https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798
(stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias") (stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias")
(stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# Ignore "error: '__EI___errno_location' specifies less restrictive attributes than its target '__errno_location'"
# New warning as of GCC 9
"-Wno-error=missing-attributes"
])
]); ]);
# When building glibc from bootstrap-tools, we need libgcc_s at RPATH for # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for

28
pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-findidxwc.patch Normal file
View file

@ -0,0 +1,28 @@
diff -ur glibc-2.27/locale/weightwc.h glibc-2.27-patched/locale/weightwc.h
--- glibc-2.27/locale/weightwc.h 2018-02-02 01:17:18.000000000 +0900
+++ glibc-2.27-patched/locale/weightwc.h 2020-01-12 03:33:41.519720579 +0900
@@ -73,7 +73,7 @@
break;
DIAG_POP_NEEDS_COMMENT;
- if (cnt == nhere)
+ if (cnt == nhere || cnt == len)
{
/* Found it. */
*cpp += nhere;
@@ -100,13 +100,13 @@
continue;
}
- if (cp[nhere - 1] > usrc[nhere -1])
+ if (cp[nhere - 1] > usrc[nhere - 1])
{
cp += 2 * nhere;
continue;
}
- if (cp[2 * nhere - 1] < usrc[nhere -1])
+ if (cp[2 * nhere - 1] < usrc[nhere - 1])
{
cp += 2 * nhere;
continue;