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

Merge branch 'master' into stdenv-updates

Browse Source 
ssp is disabled for glibc-2.13 unconditionally
This commit is contained in:
Shea Levy
2012-06-27 13:48:22 -04:00
parent fd0a9f6bae 9400646dcd
commit 8cc0edaeba
439 changed files with 6858 additions and 6571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/glibc/2.13/common.nix
View File

@@ -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")
@@ -112,6 +113,9 @@ stdenv.mkDerivation ({
] ++ stdenv.lib.optionals (cross != null) [
(if cross.withTLS then "--with-tls" else "--without-tls")
(if cross.float == "soft" then "--without-fp" else "--with-fp")
] ++ stdenv.lib.optionals (cross != null
&& cross.platform ? kernelMajor
&& cross.platform.kernelMajor == "2.6") [
"--enable-kernel=2.6.0"
"--with-__thread"
] ++ stdenv.lib.optionals stdenv.isArm [

1
pkgs/development/libraries/glibc/2.14/common.nix
View File

@@ -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")