Remove tabs/whitespace

This commit is contained in:
Eelco Dolstra
2014-10-29 13:42:59 +01:00
parent 1b55b07eeb
commit 54e727133a
+14 -14
View File
@@ -83,7 +83,7 @@ rec {
''; '';
}; };
build = build =
stdenv.mkDerivation { stdenv.mkDerivation {
name = "build"; name = "build";
@@ -91,7 +91,7 @@ rec {
buildInputs = [nukeReferences cpio]; buildInputs = [nukeReferences cpio];
buildCommand = '' buildCommand = ''
set -x set -x
mkdir -p $out/bin $out/lib $out/libexec mkdir -p $out/bin $out/lib $out/libexec
# Copy what we need of Glibc. # Copy what we need of Glibc.
@@ -105,20 +105,20 @@ rec {
cp -d ${glibc}/lib/libnsl*.so* $out/lib cp -d ${glibc}/lib/libnsl*.so* $out/lib
cp -d ${glibc}/lib/libutil*.so* $out/lib cp -d ${glibc}/lib/libutil*.so* $out/lib
cp -d ${glibc}/lib/crt?.o $out/lib cp -d ${glibc}/lib/crt?.o $out/lib
cp -rL ${glibc}/include $out cp -rL ${glibc}/include $out
chmod -R u+w $out/include chmod -R u+w $out/include
# Hopefully we won't need these. # Hopefully we won't need these.
rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video
find $out/include -name .install -exec rm {} \; find $out/include -name .install -exec rm {} \;
find $out/include -name ..install.cmd -exec rm {} \; find $out/include -name ..install.cmd -exec rm {} \;
mv $out/include $out/include-glibc mv $out/include $out/include-glibc
# Copy coreutils, bash, etc. # Copy coreutils, bash, etc.
cp ${coreutils_}/bin/* $out/bin cp ${coreutils_}/bin/* $out/bin
(cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
cp ${bash}/bin/bash $out/bin cp ${bash}/bin/bash $out/bin
cp ${findutils}/bin/find $out/bin cp ${findutils}/bin/find $out/bin
cp ${findutils}/bin/xargs $out/bin cp ${findutils}/bin/xargs $out/bin
@@ -135,7 +135,7 @@ rec {
cp ${patchelf}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin
cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep
# Copy what we need of GCC. # Copy what we need of GCC.
cp -d ${gcc.gcc}/bin/gcc $out/bin cp -d ${gcc.gcc}/bin/gcc $out/bin
cp -d ${gcc.gcc}/bin/cpp $out/bin cp -d ${gcc.gcc}/bin/cpp $out/bin
@@ -164,14 +164,14 @@ rec {
cp -d ${mpc}/lib/libmpc*.so* $out/lib cp -d ${mpc}/lib/libmpc*.so* $out/lib
cp -d ${zlib}/lib/libz.so* $out/lib cp -d ${zlib}/lib/libz.so* $out/lib
cp -d ${libelf}/lib/libelf.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib
# Copy binutils. # Copy binutils.
for i in as ld ar ranlib nm strip readelf objdump; do for i in as ld ar ranlib nm strip readelf objdump; do
cp ${binutils}/bin/$i $out/bin cp ${binutils}/bin/$i $out/bin
done done
chmod -R u+w $out chmod -R u+w $out
# Strip executables even further. # Strip executables even further.
for i in $out/bin/* $out/libexec/gcc/*/*/*; do for i in $out/bin/* $out/libexec/gcc/*/*/*; do
if test -x $i -a ! -L $i; then if test -x $i -a ! -L $i; then
@@ -210,9 +210,9 @@ rec {
allowedReferences = []; allowedReferences = [];
}; };
unpack = unpack =
stdenv.mkDerivation { stdenv.mkDerivation {
name = "unpack"; name = "unpack";
@@ -245,7 +245,7 @@ rec {
name = "test"; name = "test";
realBuilder = "${unpack}/bin/bash"; realBuilder = "${unpack}/bin/bash";
buildCommand = '' buildCommand = ''
export PATH=${unpack}/bin export PATH=${unpack}/bin
ls -l ls -l
@@ -267,7 +267,7 @@ rec {
export CPP="cpp -idirafter ${unpack}/include-glibc -B${unpack}" export CPP="cpp -idirafter ${unpack}/include-glibc -B${unpack}"
export CC="gcc -idirafter ${unpack}/include-glibc -B${unpack} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${unpack}/lib" export CC="gcc -idirafter ${unpack}/include-glibc -B${unpack} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${unpack}/lib"
export CXX="g++ -idirafter ${unpack}/include-glibc -B${unpack} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${unpack}/lib" export CXX="g++ -idirafter ${unpack}/include-glibc -B${unpack} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${unpack}/lib"
echo '#include <stdio.h>' >> foo.c echo '#include <stdio.h>' >> foo.c
echo '#include <limits.h>' >> foo.c echo '#include <limits.h>' >> foo.c
echo 'int main() { printf("Hello World\n"); return 0; }' >> foo.c echo 'int main() { printf("Hello World\n"); return 0; }' >> foo.c
@@ -286,5 +286,5 @@ rec {
make install make install
''; # */ ''; # */
}; };
} }