From d0d4123962ed53266319dff6b19c42444b26bb7a Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 4 Jun 2012 19:54:32 +0200 Subject: [PATCH 1/2] Compile glibc without -fstack-protector. At least until NixOS full supports -fstack-protector it's better to turn it off at the moment, as previous successful builds didn't include it either. --- pkgs/development/libraries/glibc/2.13/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 4058ed3d3021..535fb373e04e 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -103,6 +103,7 @@ stdenv.mkDerivation ({ "--enable-add-ons" "--sysconfdir=/etc" "--localedir=/var/run/current-system/sw/lib/locale" + "libc_cv_ssp=no" (if kernelHeaders != null then "--with-headers=${kernelHeaders}/include" else "--without-headers") From f5a5915f6e3e1756b4ce78d38c2655a912e156c4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 27 Jun 2012 16:39:14 +0200 Subject: [PATCH 2/2] Work around SSP build failure in glibc214, too. Glibc 2.14 also produces a build failure in Hydra, so we need to apply the same fix here, too. --- pkgs/development/libraries/glibc/2.14/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/glibc/2.14/common.nix b/pkgs/development/libraries/glibc/2.14/common.nix index a8d0f661b72f..ab3ef7c42f49 100644 --- a/pkgs/development/libraries/glibc/2.14/common.nix +++ b/pkgs/development/libraries/glibc/2.14/common.nix @@ -97,6 +97,7 @@ stdenv.mkDerivation ({ "--enable-add-ons" "--sysconfdir=/etc" "--localedir=/var/run/current-system/sw/lib/locale" + "libc_cv_ssp=no" (if kernelHeaders != null then "--with-headers=${kernelHeaders}/include" else "--without-headers")