|
|
|
|
@ -3,10 +3,8 @@ |
|
|
|
|
|
|
|
|
|
cross: |
|
|
|
|
|
|
|
|
|
{ name, fetchurl, fetchgit ? null, stdenv, installLocales ? false |
|
|
|
|
, gccCross ? null, kernelHeaders ? null |
|
|
|
|
, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null |
|
|
|
|
, mig ? null |
|
|
|
|
{ name, fetchurl, lib, stdenv, installLocales ? false |
|
|
|
|
, gccCross ? null, linuxHeaders ? null |
|
|
|
|
, profilingLibraries ? false, meta |
|
|
|
|
, withGd ? false, gd ? null, libpng ? null |
|
|
|
|
, preConfigure ? "", ... }@args: |
|
|
|
|
@ -18,12 +16,9 @@ let |
|
|
|
|
in |
|
|
|
|
|
|
|
|
|
assert cross != null -> gccCross != null; |
|
|
|
|
assert mig != null -> machHeaders != null; |
|
|
|
|
assert machHeaders != null -> hurdHeaders != null; |
|
|
|
|
assert hurdHeaders != null -> libpthreadHeaders != null; |
|
|
|
|
|
|
|
|
|
stdenv.mkDerivation ({ |
|
|
|
|
inherit kernelHeaders installLocales; |
|
|
|
|
inherit linuxHeaders installLocales; |
|
|
|
|
|
|
|
|
|
# The host/target system. |
|
|
|
|
crossConfig = if cross != null then cross.config else null; |
|
|
|
|
@ -32,9 +27,7 @@ stdenv.mkDerivation ({ |
|
|
|
|
|
|
|
|
|
enableParallelBuilding = true; |
|
|
|
|
|
|
|
|
|
/* Don't try to apply these patches to the Hurd's snapshot, which is |
|
|
|
|
older. */ |
|
|
|
|
patches = stdenv.lib.optionals (hurdHeaders == null) |
|
|
|
|
patches = |
|
|
|
|
[ /* Have rpcgen(1) look for cpp(1) in $PATH. */ |
|
|
|
|
./rpcgen-path.patch |
|
|
|
|
|
|
|
|
|
@ -96,36 +89,35 @@ stdenv.mkDerivation ({ |
|
|
|
|
"--sysconfdir=/etc" |
|
|
|
|
"--localedir=/var/run/current-system/sw/lib/locale" |
|
|
|
|
"libc_cv_ssp=no" |
|
|
|
|
(if kernelHeaders != null |
|
|
|
|
then "--with-headers=${kernelHeaders}/include" |
|
|
|
|
(if linuxHeaders != null |
|
|
|
|
then "--with-headers=${linuxHeaders}/include" |
|
|
|
|
else "--without-headers") |
|
|
|
|
(if profilingLibraries |
|
|
|
|
then "--enable-profile" |
|
|
|
|
else "--disable-profile") |
|
|
|
|
] ++ stdenv.lib.optionals (cross == null && kernelHeaders != null) [ |
|
|
|
|
] ++ lib.optionals (cross == null && linuxHeaders != null) [ |
|
|
|
|
"--enable-kernel=2.6.32" |
|
|
|
|
] ++ stdenv.lib.optionals (cross != null) [ |
|
|
|
|
] ++ 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 |
|
|
|
|
] ++ lib.optionals (cross != null |
|
|
|
|
&& cross.platform ? kernelMajor |
|
|
|
|
&& cross.platform.kernelMajor == "2.6") [ |
|
|
|
|
"--enable-kernel=2.6.0" |
|
|
|
|
"--with-__thread" |
|
|
|
|
] ++ stdenv.lib.optionals (cross == null && stdenv.isArm) [ |
|
|
|
|
] ++ lib.optionals (cross == null && stdenv.isArm) [ |
|
|
|
|
"--host=arm-linux-gnueabi" |
|
|
|
|
"--build=arm-linux-gnueabi" |
|
|
|
|
|
|
|
|
|
# To avoid linking with -lgcc_s (dynamic link) |
|
|
|
|
# so the glibc does not depend on its compiler store path |
|
|
|
|
"libc_cv_as_needed=no" |
|
|
|
|
] ++ stdenv.lib.optional withGd "--with-gd"; |
|
|
|
|
] ++ lib.optional withGd "--with-gd"; |
|
|
|
|
|
|
|
|
|
installFlags = [ "sysconfdir=$(out)/etc" ]; |
|
|
|
|
|
|
|
|
|
buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ] |
|
|
|
|
++ stdenv.lib.optional (mig != null) mig |
|
|
|
|
++ stdenv.lib.optionals withGd [ gd libpng ]; |
|
|
|
|
buildInputs = lib.optionals (cross != null) [ gccCross ] |
|
|
|
|
++ lib.optionals withGd [ gd libpng ]; |
|
|
|
|
|
|
|
|
|
# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to |
|
|
|
|
# prevent a retained dependency on the bootstrap tools in the stdenv-linux |
|
|
|
|
@ -137,32 +129,22 @@ stdenv.mkDerivation ({ |
|
|
|
|
# I.e. when gcc is compiled with --with-arch=i686, then the |
|
|
|
|
# preprocessor symbol `__i686' will be defined to `1'. This causes |
|
|
|
|
# the symbol __i686.get_pc_thunk.dx to be mangled. |
|
|
|
|
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686" |
|
|
|
|
NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.system == "i686-linux") "-U__i686" |
|
|
|
|
+ " -Wno-error=strict-prototypes"; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
# Remove the `gccCross' attribute so that the *native* glibc store path |
|
|
|
|
# doesn't depend on whether `gccCross' is null or not. |
|
|
|
|
// (removeAttrs args [ "gccCross" "fetchurl" "fetchgit" "withGd" "gd" "libpng" ]) // |
|
|
|
|
// (removeAttrs args [ "lib" "gccCross" "fetchurl" "withGd" "gd" "libpng" ]) // |
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
name = name + "-${version}" + |
|
|
|
|
stdenv.lib.optionalString (cross != null) "-${cross.config}"; |
|
|
|
|
|
|
|
|
|
src = |
|
|
|
|
if hurdHeaders != null |
|
|
|
|
then fetchgit { |
|
|
|
|
# Shamefully the "official" glibc won't build on GNU, so use the one |
|
|
|
|
# maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch. |
|
|
|
|
# See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>. |
|
|
|
|
url = "git://git.sv.gnu.org/hurd/glibc.git"; |
|
|
|
|
sha256 = "cecec9dd5a2bafc875c56b058b6d7628a22b250b53747513dec304f31ffdb82d"; |
|
|
|
|
rev = "d3cdecf18e6550b0984a42b43ed48c5fb26501e1"; |
|
|
|
|
} |
|
|
|
|
else fetchurl { |
|
|
|
|
url = "mirror://gnu/glibc/glibc-${version}.tar.gz"; |
|
|
|
|
sha256 = "1rcby0cqgswgqaxyqz0yqc4zizb1kvpi5vlfqp7dh3sa132109m6"; |
|
|
|
|
}; |
|
|
|
|
lib.optionalString (cross != null) "-${cross.config}"; |
|
|
|
|
|
|
|
|
|
src = fetchurl { |
|
|
|
|
url = "mirror://gnu/glibc/glibc-${version}.tar.gz"; |
|
|
|
|
sha256 = "1rcby0cqgswgqaxyqz0yqc4zizb1kvpi5vlfqp7dh3sa132109m6"; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
# Remove absolute paths from `configure' & co.; build out-of-tree. |
|
|
|
|
preConfigure = '' |
|
|
|
|
@ -178,17 +160,18 @@ stdenv.mkDerivation ({ |
|
|
|
|
|
|
|
|
|
configureScript="`pwd`/../$sourceRoot/configure" |
|
|
|
|
|
|
|
|
|
${stdenv.lib.optionalString (stdenv.cc.libc != null) |
|
|
|
|
${lib.optionalString (stdenv.cc.libc != null) |
|
|
|
|
''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"'' |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
${preConfigure} |
|
|
|
|
''; |
|
|
|
|
|
|
|
|
|
preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH"; |
|
|
|
|
|
|
|
|
|
meta = { |
|
|
|
|
homepage = http://www.gnu.org/software/libc/; |
|
|
|
|
description = "The GNU C Library" |
|
|
|
|
+ stdenv.lib.optionalString (hurdHeaders != null) ", for GNU/Hurd"; |
|
|
|
|
description = "The GNU C Library"; |
|
|
|
|
|
|
|
|
|
longDescription = |
|
|
|
|
'' Any Unix-like operating system needs a C library: the library which |
|
|
|
|
@ -199,24 +182,9 @@ stdenv.mkDerivation ({ |
|
|
|
|
most systems with the Linux kernel. |
|
|
|
|
''; |
|
|
|
|
|
|
|
|
|
license = stdenv.lib.licenses.lgpl2Plus; |
|
|
|
|
license = lib.licenses.lgpl2Plus; |
|
|
|
|
|
|
|
|
|
maintainers = [ ]; |
|
|
|
|
#platforms = stdenv.lib.platforms.linux; |
|
|
|
|
maintainers = [ lib.maintainers.eelco ]; |
|
|
|
|
#platforms = lib.platforms.linux; |
|
|
|
|
} // meta; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// stdenv.lib.optionalAttrs withGd { |
|
|
|
|
preBuild = "unset NIX_DONT_SET_RPATH"; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// stdenv.lib.optionalAttrs (hurdHeaders != null) { |
|
|
|
|
# Work around the fact that the configure snippet that looks for |
|
|
|
|
# <hurd/version.h> does not honor `--with-headers=$sysheaders' and that |
|
|
|
|
# glibc expects Mach, Hurd, and pthread headers to be in the same place. |
|
|
|
|
CPATH = "${hurdHeaders}/include:${machHeaders}/include:${libpthreadHeaders}/include"; |
|
|
|
|
|
|
|
|
|
# Install NSS stuff in the right place. |
|
|
|
|
# XXX: This will be needed for all new glibcs and isn't Hurd-specific. |
|
|
|
|
makeFlags = ''vardbdir="$out/var/db"''; |
|
|
|
|
}) |
|
|
|
|
|
Eelco Dolstra
8 years ago