public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #76972 from thefloweringash/cross-glibc-warnings 

glibc: fix cross compilation build failure
This commit is contained in:
Florian Klink 2020-01-11 20:28:29 +01:00 committed by GitHub
parent 961d0cf9f5 51014768d2
commit 5e51524293
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 14 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

25
pkgs/development/libraries/glibc/default.nix
View File

@ -49,20 +49,17 @@ callPackage ./common.nix { inherit stdenv; } {
++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie"; ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie";
NIX_CFLAGS_COMPILE = stdenv.lib.concatStringsSep " " NIX_CFLAGS_COMPILE = stdenv.lib.concatStringsSep " "
(if !stdenv.hostPlatform.isMusl (builtins.concatLists [
# TODO: This (returning a string or `null`, instead of a list) is to (stdenv.lib.optionals withGd gdCflags)
# not trigger a mass rebuild due to the introduction of the # Fix -Werror build failure when building glibc with musl with GCC >= 8, see:
# musl-specific flags below. # https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798
# At next change to non-musl glibc builds, remove this `then` (stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias")
# and the above condition, instead keeping only the `else` below. (stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
then (stdenv.lib.optionals withGd gdCflags) # Ignore "error: '__EI___errno_location' specifies less restrictive attributes than its target '__errno_location'"
else # New warning as of GCC 9
(builtins.concatLists [ "-Wno-error=missing-attributes"
(stdenv.lib.optionals withGd gdCflags) ])
# Fix -Werror build failure when building glibc with musl with GCC >= 8, see: ]);
# https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798
(stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias")
]));
# 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
# any program we run, because the gcc will have been placed at a new # any program we run, because the gcc will have been placed at a new

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;