BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

glibc: Drop hurd support

Browse source 
This hasn't been maintained since 2012.

Also, renamed glibc's kernelHeaders argument to linuxHeaders.
This commit is contained in:
Eelco Dolstra 2016-02-18 21:11:15 +01:00
parent f98a5946b7
commit 1ab14aad7a
9 changed files with 43 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/development/libraries/glibc/builder.sh
View file

@ -22,22 +22,11 @@ postInstall() {
test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache
# FIXME: Use `test -n $linuxHeaders' when `kernelHeaders' has been
# renamed.
if test -z "$hurdHeaders"; then
if test -n "$linuxHeaders"; then
# Include the Linux kernel headers in Glibc, except the `scsi'
# subdirectory, which Glibc provides itself.
(cd $out/include && \
ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .)
fi
if test -f "$out/lib/libhurduser.so"; then
# libc.so, libhurduser.so, and libmachuser.so depend on each
# other, so add them to libc.so (a RUNPATH on libc.so.0.3
# would be ignored by the cross-linker.)
echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..."
sed -i "$out/lib/libc.so" \
-e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g"
ln -sv $(ls -d $linuxHeaders/include/* | grep -v 'scsi$') .)
fi
# Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink

86
pkgs/development/libraries/glibc/common.nix
View file

@ -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}";
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";
};
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"'';
})

28
pkgs/development/libraries/glibc/default.nix
View file

@ -1,6 +1,4 @@
{ stdenv, fetchurl, fetchgit ? null, kernelHeaders
, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
, mig ? null
{ lib, stdenv, fetchurl, linuxHeaders
, installLocales ? true
, profilingLibraries ? false
, gccCross ? null
@ -16,11 +14,10 @@ let
in
build cross ({
name = "glibc"
+ stdenv.lib.optionalString (hurdHeaders != null) "-hurd"
+ stdenv.lib.optionalString debugSymbols "-debug"
+ stdenv.lib.optionalString withGd "-gd";
+ lib.optionalString debugSymbols "-debug"
+ lib.optionalString withGd "-gd";
inherit fetchurl fetchgit stdenv kernelHeaders installLocales
inherit lib stdenv fetchurl linuxHeaders installLocales
profilingLibraries gccCross withGd gd libpng;
builder = ./builder.sh;
@ -58,23 +55,6 @@ in
//
(if hurdHeaders != null
then rec {
inherit machHeaders hurdHeaders libpthreadHeaders mig fetchgit;
propagatedBuildInputs = [ machHeaders hurdHeaders libpthreadHeaders ];
passthru = {
# When building GCC itself `propagatedBuildInputs' above is not
# honored, so we pass it here so that the GCC builder can do the right
# thing.
inherit propagatedBuildInputs;
};
}
else { })
//
(if cross != null
then {
preConfigure = ''

4
pkgs/development/libraries/glibc/info.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, texinfo, perl }:
{ lib, stdenv, fetchurl, texinfo, perl }:
let build = import ./common.nix; in
@ -6,7 +6,7 @@ let build = import ./common.nix; in
build null {
name = "glibc-info";
inherit fetchurl stdenv;
inherit fetchurl stdenv lib;
configureFlags = [ "--enable-add-ons" ];

4
pkgs/development/libraries/glibc/locales.nix
View file

@ -6,14 +6,14 @@
http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc
*/
{ stdenv, fetchurl, writeText, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }:
{ lib, stdenv, fetchurl, writeText, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }:
let build = import ./common.nix; in
build null {
name = "glibc-locales";
inherit fetchurl stdenv;
inherit fetchurl stdenv lib;
installLocales = true;
builder = ./locales-builder.sh;

2
pkgs/os-specific/linux/cpufrequtils/default.nix
View file

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
-i Makefile
'';
buildInputs = [ stdenv.cc.libc.kernelHeaders libtool gettext ];
buildInputs = [ stdenv.cc.libc.linuxHeaders libtool gettext ];
meta = {
description = "Tools to display or change the CPU governor settings";

2
pkgs/os-specific/linux/dietlibc/default.nix
View file

@ -11,7 +11,7 @@ stdenv.mkDerivation {
builder = ./builder.sh;
inherit glibc;
kernelHeaders = glibc.kernelHeaders;
kernelHeaders = glibc.linuxHeaders;
patches = [

4
pkgs/tools/networking/nbd/default.nix
View file

@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "1pkkid657zgjymwxv3fm32cxnq9llfz29rl15vp6mn42vnzbj1di";
};
buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders;
buildInputs =
[ pkgconfig glib ]
++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders;
postInstall = ''
mkdir -p "$out/share/doc/${name}"

6
pkgs/top-level/all-packages.nix
View file

@ -6707,22 +6707,18 @@ let
glfw3 = callPackage ../development/libraries/glfw/3.x.nix { };
glibc = callPackage ../development/libraries/glibc {
kernelHeaders = linuxHeaders;
installLocales = config.glibc.locales or false;
machHeaders = null;
hurdHeaders = null;
gccCross = null;
};
glibc_memusage = callPackage ../development/libraries/glibc {
kernelHeaders = linuxHeaders;
installLocales = false;
withGd = true;
};
glibcCross = forceNativeDrv (glibc.override {
gccCross = gccCrossStageStatic;
kernelHeaders = linuxHeadersCross;
linuxHeaders = linuxHeadersCross;
});
# We can choose: