Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5e515242936c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cd827f2209b3
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Jan 11, 2020

  1. Revert "glibc: fix cross compilation build failure" 

    This reverts commit 5101476.
    @flokli
    flokli committed Jan 11, 2020
    Copy the full SHA
    cd827f2 View commit details
5 changes: 0 additions & 5 deletions pkgs/development/libraries/glibc/common.nix
View file
Original file line number Diff line number Diff line change
@@ -97,11 +97,6 @@ stdenv.mkDerivation ({
./CVE-2018-11236.patch
# https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f51c8367685dc888a02f7304c729ed5277904aff
./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 [
./fix-x64-abi.patch
5 changes: 0 additions & 5 deletions pkgs/development/libraries/glibc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -54,11 +54,6 @@ callPackage ./common.nix { inherit stdenv; } {
# 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")
(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
28 changes: 0 additions & 28 deletions pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-findidxwc.patch
View file

This file was deleted.