From 1c51aeea027e7b610cae18a7f17d7f8e37ff737c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 24 Aug 2010 22:08:01 +0000 Subject: [PATCH] A segfault-creating state of the branch. svn path=/nixpkgs/branches/stdenv-bootstrap-20100825/; revision=23413 --- pkgs/os-specific/linux/uclibc/default.nix | 87 ++++++++++++------- .../stdenv/linux/bootstrap/x86_64/default.nix | 4 +- pkgs/stdenv/linux/make-bootstrap-tools.nix | 59 +++++++++++-- .../linux/scripts/unpack-bootstrap-tools.sh | 2 +- pkgs/tools/networking/curl/default.nix | 6 +- 5 files changed, 113 insertions(+), 45 deletions(-) diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 5c941f06410..09b86d589b3 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -1,54 +1,75 @@ -{stdenv, fetchurl, linuxHeaders, libiconv, cross ? null, gccCross ? null}: +{stdenv, fetchurl, linuxHeaders, libiconv, cross ? null, gccCross ? null, +extraConfig ? ""}: assert stdenv.isLinux; assert cross != null -> gccCross != null; let - enableArmEABI = (cross == null && stdenv.platform.kernelArch == "arm") - || (cross != null && cross.arch == "arm"); + configParser = '' + function parseconfig { + set -x + while read LINE; do + NAME=`echo "$LINE" | cut -d \ -f 1` + OPTION=`echo "$LINE" | cut -d \ -f 2` - configArmEABI = if enableArmEABI then - ''-e 's/.*CONFIG_ARM_OABI.*//' \ - -e 's/.*CONFIG_ARM_EABI.*/CONFIG_ARM_EABI=y/' '' else ""; + if test -z "$NAME"; then + continue + fi - enableBigEndian = (cross != null && cross.bigEndian); - - configBigEndian = if enableBigEndian then "" - else - ''-e 's/.*ARCH_BIG_ENDIAN.*/#ARCH_BIG_ENDIAN=y/' \ - -e 's/.*ARCH_WANTS_BIG_ENDIAN.*/#ARCH_WANTS_BIG_ENDIAN=y/' \ - -e 's/.*ARCH_WANTS_LITTLE_ENDIAN.*/ARCH_WANTS_LITTLE_ENDIAN=y/' ''; + if test "$NAME" == "CLEAR"; then + echo "parseconfig: CLEAR" + echo > .config + fi + + echo "parseconfig: removing $NAME" + sed -i /^$NAME=/d .config + + if test "$OPTION" != n; then + echo "parseconfig: setting $NAME=$OPTION" + echo "$NAME=$OPTION" >> .config + fi + done + set +x + } + ''; + + archMakeFlag = if (cross != null) then "ARCH=${cross.arch}" else ""; + crossMakeFlag = if (cross != null) then "CROSS=${cross.config}-" else ""; + + nixConfig = '' + RUNTIME_PREFIX "/" + DEVEL_PREFIX "/" + UCLIBC_HAS_WCHAR y + UCLIBC_HAS_FTW y + UCLIBC_HAS_RPC y + DO_C99_MATH y + UCLIBC_HAS_PROGRAM_INVOCATION_NAME y + KERNEL_HEADERS "${linuxHeaders}/include" + + UCLIBC_SUSV3_LEGACY y + UCLIBC_SUSV4_LEGACY y + ''; - archMakeFlag = if (cross != null) then "ARCH=${cross.arch}" else ""; - crossMakeFlag = if (cross != null) then "CROSS=${cross.config}-" else ""; in stdenv.mkDerivation { - name = "uclibc-0.9.30.3" + stdenv.lib.optionalString (cross != null) + name = "uclibc-0.9.31" + stdenv.lib.optionalString (cross != null) ("-" + cross.config); src = fetchurl { - url = http://www.uclibc.org/downloads/uClibc-0.9.30.3.tar.bz2; - sha256 = "0f1fpdwampbw7pf79i64ipj0azk4kbc9wl81ynlp19p92k4klz0h"; + url = http://www.uclibc.org/downloads/uClibc-0.9.31.tar.bz2; + sha256 = "1yk328fnz0abgh2vm2r68y65ckfkx97rdp8hbg4xvmx5s94kblw0"; }; # 'ftw' needed to build acl, a coreutils dependency configurePhase = '' make defconfig ${archMakeFlag} - sed -e s@/usr/include@${linuxHeaders}/include@ \ - -e 's@^RUNTIME_PREFIX.*@RUNTIME_PREFIX="/"@' \ - -e 's@^DEVEL_PREFIX.*@DEVEL_PREFIX="/"@' \ - -e 's@.*UCLIBC_HAS_WCHAR.*@UCLIBC_HAS_WCHAR=y@' \ - -e 's@.*UCLIBC_HAS_FTW.*@UCLIBC_HAS_FTW=y@' \ - -e 's@.*UCLIBC_HAS_RPC.*@UCLIBC_HAS_RPC=y@' \ - -e 's@.*DO_C99_MATH.*@DO_C99_MATH=y@' \ - -e 's@.*UCLIBC_HAS_PROGRAM_INVOCATION_NAME.*@UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y@' \ - -e 's@.*CONFIG_MIPS_ISA_1.*@#CONFIG_MIPS_ISA_1=y@' \ - -e 's@.*CONFIG_MIPS_ISA_3.*@CONFIG_MIPS_ISA_3=y@' \ - -e 's@.*CONFIG_MIPS_O32_ABI.*@#CONFIG_MIPS_O32_ABI=y@' \ - -e 's@.*CONFIG_MIPS_N32_ABI.*@CONFIG_MIPS_N32_ABI=y@' \ - ${configArmEABI} \ - ${configBigEndian} \ - -i .config + ${configParser} + cat << EOF | parseconfig + ${nixConfig} + ${extraConfig} + ${if cross != null then cross.uclibc.extraConfig else ""} + $extraCrossConfig + EOF make oldconfig ''; diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix index ffd23a86603..d9b9b460db2 100644 --- a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix +++ b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix @@ -4,7 +4,7 @@ { bootstrapTools = { - url = http://nixos.org/tarballs/stdenv-linux/x86_64/r16022/bootstrap-tools.cpio.bz2; - sha256 = "1hwmyd9x9lhmb1ckwap2lvf7wi34p1j23v5bw41drym4mfp97ynz"; + url = http://nixos.org/tarballs/stdenv-linux/x86_64/r23302/bootstrap-tools.cpio.bz2; + sha256 = "0w89kqhx47yl0jifp2vffp073pyrqha5f312kp971smi4h41drna"; }; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 9a337de9b21..6d23e3812f9 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -31,6 +31,49 @@ rec { #gccNoShared = wrapGCC ( gcc.gcc.override { enableShared = false; } ); + busyboxStaticSh = busybox.override { + extraConfig = '' + CLEAR + CONFIG_STATIC y + + CONFIG_ASH y + CONFIG_BASH_COMPAT y + CONFIG_ASH_ALIAS y + CONFIG_ASH_GETOPTS y + CONFIG_ASH_CMDCMD y + CONFIG_ASH_JOB_CONTROL y + CONFIG_ASH_BUILTIN_ECHO y + CONFIG_ASH_BUILTIN_PRINTF y + CONFIG_ASH_BUILTIN_TEST y + ''; + }; + + busyboxStaticLn = busybox.override { + extraConfig = '' + CLEAR + CONFIG_STATIC y + CONFIG_LN y + ''; + }; + + busyboxStaticMkdir = busybox.override { + extraConfig = '' + CLEAR + CONFIG_STATIC y + CONFIG_MKDIR y + ''; + }; + + busyboxStaticCpio = busybox.override { + extraConfig = '' + CLEAR + CONFIG_STATIC y + CONFIG_CPIO y + CONFIG_FEATURE_CPIO_O y + CONFIG_FEATURE_CPIO_P y + ''; + }; + build = stdenv.mkDerivation { @@ -43,7 +86,7 @@ rec { ensureDir $out/bin $out/lib $out/libexec # Copy what we need of Glibc. - cp -d ${glibc}/lib/ld-*.so* $out/lib + cp -d ${glibc}/lib/ld*.so* $out/lib cp -d ${glibc}/lib/libc*.so* $out/lib cp -d ${glibc}/lib/libc_nonshared.a $out/lib cp -d ${glibc}/lib/libm*.so* $out/lib @@ -97,6 +140,7 @@ rec { rm -f $out/lib/gcc/*/*/include*/sound rm -rf $out/lib/gcc/*/*/include*/root rm -f $out/lib/gcc/*/*/include-fixed/asm + rm -rf $out/lib/gcc/*/*/plugin #rm -f $out/lib/gcc/*/*/*.a cp -rd ${gcc.gcc}/libexec/* $out/libexec mkdir $out/include @@ -105,10 +149,13 @@ rec { rm -rf $out/include/c++/*/ext/pb_ds rm -rf $out/include/c++/*/ext/parallel - cp -d ${gmp}/lib/libgmp*.so* $out/lib + cp -d ${gmpxx}/lib/libgmp*.so* $out/lib cp -d ${mpfr}/lib/libmpfr*.so* $out/lib cp -d ${ppl}/lib/libppl*.so* $out/lib cp -d ${cloogppl}/lib/libcloog*.so* $out/lib + cp -d ${mpc}/lib/libmpc*.so* $out/lib + cp -d ${zlib}/lib/libz.so* $out/lib + cp -d ${libelf}/lib/libelf.so* $out/lib # Copy binutils. for i in as ld ar ranlib nm strip readelf objdump; do @@ -137,10 +184,10 @@ rec { (cd $out/pack && (find | cpio -o -H newc)) | bzip2 > $out/on-server/bootstrap-tools.cpio.bz2 mkdir $out/in-nixpkgs - cp ${klibc}/lib/klibc/bin.static/sh $out/in-nixpkgs - cp ${klibc}/lib/klibc/bin.static/cpio $out/in-nixpkgs - cp ${klibc}/lib/klibc/bin.static/mkdir $out/in-nixpkgs - cp ${klibc}/lib/klibc/bin.static/ln $out/in-nixpkgs + cp ${busyboxStaticSh}/bin/busybox $out/in-nixpkgs/sh + cp ${busyboxStaticCpio}/bin/busybox $out/in-nixpkgs/cpio + cp ${busyboxStaticMkdir}/bin/busybox $out/in-nixpkgs/mkdir + cp ${busyboxStaticLn}/bin/busybox $out/in-nixpkgs/ln cp ${curlStatic}/bin/curl $out/in-nixpkgs cp ${bzip2Static}/bin/bzip2 $out/in-nixpkgs chmod u+w $out/in-nixpkgs/* diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh index b3f5dbb546d..422dc6dd5fe 100644 --- a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh @@ -39,7 +39,7 @@ for i in $out/lib/librt* ; do fi done -for i in $out/lib/libgmp* $out/lib/libppl* $out/lib/libcloog* $out/lib/libmpc*; do +for i in $out/lib/libgmp* $out/lib/libppl* $out/lib/libcloog* $out/lib/libmpc* $out/lib/libpcre* $out/lib/libstdc++*.so.*[0-9]; do echo trying to patch $i if test -f $i -a ! -L $i; then LD_LIBRARY_PATH=$out/lib $LD_BINARY \ diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 33f11cdede5..57ce663080a 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl -, zlibSupport ? false, zlib -, sslSupport ? false, openssl -, scpSupport ? false, libssh2 +, zlibSupport ? false, zlib ? null +, sslSupport ? false, openssl ? null +, scpSupport ? false, libssh2 ? null , linkStatic ? false }: