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

Merge remote-tracking branch 'aszlig/glibc_ssp_fix'

Browse Source 
glibc 2.13 and 2.14 fail to build with our current stdenv unless the ssp is
disabled. For glibc 2.13, I've only disabled the ssp when it's being built with
a complete stdenv to avoid a stdenv rebuild
This commit is contained in:
Shea Levy
2012-06-27 11:11:36 -04:00
parent aecc8b64ed f5a5915f6e
commit 9400646dcd
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/glibc/2.13/common.nix
+2 -1
View File
@@ -102,7 +102,8 @@ stdenv.mkDerivation ({
"-C" "-C"
"--enable-add-ons" "--enable-add-ons"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localedir=/var/run/current-system/sw/lib/locale" "--localedir=/var/run/current-system/sw/lib/locale" ] ++
(stdenv.lib.optional (stdenv.name == "stdenv") "libc_cv_ssp=no") ++ [
(if kernelHeaders != null (if kernelHeaders != null
then "--with-headers=${kernelHeaders}/include" then "--with-headers=${kernelHeaders}/include"
else "--without-headers") else "--without-headers")
pkgs/development/libraries/glibc/2.14/common.nix
+1
View File
@@ -97,6 +97,7 @@ stdenv.mkDerivation ({
"--enable-add-ons" "--enable-add-ons"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localedir=/var/run/current-system/sw/lib/locale" "--localedir=/var/run/current-system/sw/lib/locale"
"libc_cv_ssp=no"
(if kernelHeaders != null (if kernelHeaders != null
then "--with-headers=${kernelHeaders}/include" then "--with-headers=${kernelHeaders}/include"
else "--without-headers") else "--without-headers")