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

Undoing glibc 2.13 work for the pi

Browse Source 
(previous attempt of bootstrapping from the armv5tel bootstrap tools)
This commit is contained in:
Lluís Batlle i Rossell 2012-12-23 20:16:50 +01:00
parent 6c9002639d
commit 68a65bcf2a
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ cross :
, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null , machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
, mig ? null, fetchgit ? null , mig ? null, fetchgit ? null
, profilingLibraries ? false, meta , profilingLibraries ? false, meta
, preConfigure ? "", recentGcc ? true, ... }@args : , preConfigure ? "", ... }@args :
let let
# For GNU/Hurd, see below. # For GNU/Hurd, see below.
@ -121,8 +121,7 @@ stdenv.mkDerivation ({
"--enable-kernel=2.6.0" "--enable-kernel=2.6.0"
"--with-__thread" "--with-__thread"
] ++ stdenv.lib.optionals (cross == null && ] ++ stdenv.lib.optionals (cross == null &&
(stdenv.system == "armv5tel-linux") || (stdenv.system == "armv5tel-linux")) [
(!recentGcc && stdenv.platform.name == "raspberrypi")) [
"--host=arm-linux-gnueabi" "--host=arm-linux-gnueabi"
"--build=arm-linux-gnueabi" "--build=arm-linux-gnueabi"
"--without-fp" "--without-fp"
@ -130,7 +129,7 @@ stdenv.mkDerivation ({
# To avoid linking with -lgcc_s (dynamic link) # To avoid linking with -lgcc_s (dynamic link)
# so the glibc does not depend on its compiler store path # so the glibc does not depend on its compiler store path
"libc_cv_as_needed=no" "libc_cv_as_needed=no"
] ++ stdenv.lib.optionals (cross == null && recentGcc && stdenv.platform.name == "raspberrypi") [ ] ++ stdenv.lib.optionals (cross == null && stdenv.platform.name == "raspberrypi") [
"--host=arm-linux-gnueabihf" "--host=arm-linux-gnueabihf"
"--build=arm-linux-gnueabihf" "--build=arm-linux-gnueabihf"
"--with-fp" "--with-fp"
@ -202,10 +201,6 @@ stdenv.mkDerivation ({
configureScript="`pwd`/../$sourceRoot/configure" configureScript="`pwd`/../$sourceRoot/configure"
${preConfigure} ${preConfigure}
'' + stdenv.lib.optionalString (cross == null
&& recentGcc
&& stdenv.platform.name == "raspberrypi") ''
configureFlagsArray=("CFLAGS=-march=armv6 -mfpu=vfp -mhard-float")
''; '';
meta = { meta = {