pyrox.dev
Setting new bootstrap-tools for x86_64.
Allowing 'curl' build without some dependencies, if it is told not to build
with them.
Updating the make-bootstrap-tools for the latest gcc/glibc, removing the
dependency on klibc, and updating unpack-boostrap-tools for the latest
boostrap-tools to work.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23305
+2
-2
pkgs/stdenv/linux/bootstrap/x86_64/default.nix
+2
-2
pkgs/stdenv/linux/bootstrap/x86_64/default.nix
···
4
4
5
5
{
6
6
bootstrapTools = {
7
-
url = http://nixos.org/tarballs/stdenv-linux/x86_64/r16022/bootstrap-tools.cpio.bz2;
8
-
sha256 = "1hwmyd9x9lhmb1ckwap2lvf7wi34p1j23v5bw41drym4mfp97ynz";
7
+
url = http://nixos.org/tarballs/stdenv-linux/x86_64/r23302/bootstrap-tools.cpio.bz2;
8
+
sha256 = "0w89kqhx47yl0jifp2vffp073pyrqha5f312kp971smi4h41drna";
9
9
};
10
10
}
+53
-6
pkgs/stdenv/linux/make-bootstrap-tools.nix
+53
-6
pkgs/stdenv/linux/make-bootstrap-tools.nix
···
31
31
32
32
#gccNoShared = wrapGCC ( gcc.gcc.override { enableShared = false; } );
33
33
34
+
busyboxStaticSh = busybox.override {
35
+
extraConfig = ''
36
+
CLEAR
37
+
CONFIG_STATIC y
38
+
39
+
CONFIG_ASH y
40
+
CONFIG_BASH_COMPAT y
41
+
CONFIG_ASH_ALIAS y
42
+
CONFIG_ASH_GETOPTS y
43
+
CONFIG_ASH_CMDCMD y
44
+
CONFIG_ASH_JOB_CONTROL y
45
+
CONFIG_ASH_BUILTIN_ECHO y
46
+
CONFIG_ASH_BUILTIN_PRINTF y
47
+
CONFIG_ASH_BUILTIN_TEST y
48
+
'';
49
+
};
50
+
51
+
busyboxStaticLn = busybox.override {
52
+
extraConfig = ''
53
+
CLEAR
54
+
CONFIG_STATIC y
55
+
CONFIG_LN y
56
+
'';
57
+
};
58
+
59
+
busyboxStaticMkdir = busybox.override {
60
+
extraConfig = ''
61
+
CLEAR
62
+
CONFIG_STATIC y
63
+
CONFIG_MKDIR y
64
+
'';
65
+
};
66
+
67
+
busyboxStaticCpio = busybox.override {
68
+
extraConfig = ''
69
+
CLEAR
70
+
CONFIG_STATIC y
71
+
CONFIG_CPIO y
72
+
CONFIG_FEATURE_CPIO_O y
73
+
CONFIG_FEATURE_CPIO_P y
74
+
'';
75
+
};
76
+
34
77
build =
35
78
36
79
stdenv.mkDerivation {
···
43
86
ensureDir $out/bin $out/lib $out/libexec
44
87
45
88
# Copy what we need of Glibc.
46
-
cp -d ${glibc}/lib/ld-*.so* $out/lib
89
+
cp -d ${glibc}/lib/ld*.so* $out/lib
47
90
cp -d ${glibc}/lib/libc*.so* $out/lib
48
91
cp -d ${glibc}/lib/libc_nonshared.a $out/lib
49
92
cp -d ${glibc}/lib/libm*.so* $out/lib
···
97
140
rm -f $out/lib/gcc/*/*/include*/sound
98
141
rm -rf $out/lib/gcc/*/*/include*/root
99
142
rm -f $out/lib/gcc/*/*/include-fixed/asm
143
+
rm -rf $out/lib/gcc/*/*/plugin
100
144
#rm -f $out/lib/gcc/*/*/*.a
101
145
cp -rd ${gcc.gcc}/libexec/* $out/libexec
102
146
mkdir $out/include
···
105
149
rm -rf $out/include/c++/*/ext/pb_ds
106
150
rm -rf $out/include/c++/*/ext/parallel
107
151
108
-
cp -d ${gmp}/lib/libgmp*.so* $out/lib
152
+
cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
109
153
cp -d ${mpfr}/lib/libmpfr*.so* $out/lib
110
154
cp -d ${ppl}/lib/libppl*.so* $out/lib
111
155
cp -d ${cloogppl}/lib/libcloog*.so* $out/lib
156
+
cp -d ${mpc}/lib/libmpc*.so* $out/lib
157
+
cp -d ${zlib}/lib/libz.so* $out/lib
158
+
cp -d ${libelf}/lib/libelf.so* $out/lib
112
159
113
160
# Copy binutils.
114
161
for i in as ld ar ranlib nm strip readelf objdump; do
···
137
184
(cd $out/pack && (find | cpio -o -H newc)) | bzip2 > $out/on-server/bootstrap-tools.cpio.bz2
138
185
139
186
mkdir $out/in-nixpkgs
140
-
cp ${klibc}/lib/klibc/bin.static/sh $out/in-nixpkgs
141
-
cp ${klibc}/lib/klibc/bin.static/cpio $out/in-nixpkgs
142
-
cp ${klibc}/lib/klibc/bin.static/mkdir $out/in-nixpkgs
143
-
cp ${klibc}/lib/klibc/bin.static/ln $out/in-nixpkgs
187
+
cp ${busyboxStaticSh}/bin/busybox $out/in-nixpkgs/sh
188
+
cp ${busyboxStaticCpio}/bin/busybox $out/in-nixpkgs/cpio
189
+
cp ${busyboxStaticMkdir}/bin/busybox $out/in-nixpkgs/mkdir
190
+
cp ${busyboxStaticLn}/bin/busybox $out/in-nixpkgs/ln
144
191
cp ${curlStatic}/bin/curl $out/in-nixpkgs
145
192
cp ${bzip2Static}/bin/bzip2 $out/in-nixpkgs
146
193
chmod u+w $out/in-nixpkgs/*
+1
-1
pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
+1
-1
pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
···
39
39
fi
40
40
done
41
41
42
-
for i in $out/lib/libgmp* $out/lib/libppl* $out/lib/libcloog* $out/lib/libmpc*; do
42
+
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
43
43
echo trying to patch $i
44
44
if test -f $i -a ! -L $i; then
45
45
LD_LIBRARY_PATH=$out/lib $LD_BINARY \
+3
-3
pkgs/tools/networking/curl/default.nix
+3
-3
pkgs/tools/networking/curl/default.nix