Mercurial > hg > aboriginal
annotate sources/patches/squashfs-tools-4.0-uclibc-get_nprocs.patch @ 979:88b354c0eee1
Tweak mercurial repo entry and add link to current snapshot.
author | Rob Landley <rob@landley.net> |
---|---|
date | Tue, 16 Feb 2010 06:57:14 -0600 |
parents | 4e798d7aa5f9 |
children |
rev | line source |
---|---|
923
4e798d7aa5f9
Move to 2.6.32 kernel, updating patches. (With a much less ugly fix for powerpc, and allowing arm to use more qemu -cpu options.)
Rob Landley <rob@landley.net>
parents:
912
diff
changeset
|
1 uclibc does not have get_nprocs() so build of squashfs host tool fails |
4e798d7aa5f9
Move to 2.6.32 kernel, updating patches. (With a much less ugly fix for powerpc, and allowing arm to use more qemu -cpu options.)
Rob Landley <rob@landley.net>
parents:
912
diff
changeset
|
2 |
912
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
3 --- a/squashfs-tools/mksquashfs.c Wed Dec 2 10:30:31 2009 |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
4 +++ b/squashfs-tools/mksquashfs.c Wed Dec 2 10:31:34 2009 |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
5 @@ -3705,7 +3705,7 @@ |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
6 processors = 1; |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
7 } |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
8 #else |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
9 - processors = get_nprocs(); |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
10 + processors = sysconf(_SC_NPROCESSORS_ONLN); |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
11 #endif |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
12 } |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
13 |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
14 --- a/squashfs-tools/unsquashfs.c Wed Dec 2 10:30:31 2009 |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
15 +++ b/squashfs-tools/unsquashfs.c Wed Dec 2 10:31:34 2009 |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
16 @@ -1811,7 +1811,7 @@ |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
17 processors = 1; |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
18 } |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
19 #else |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
20 - processors = get_nprocs(); |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
21 + processors = sysconf(_SC_NPROCESSORS_ONLN); |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
22 #endif |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
23 } |
505e0d613464
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff
changeset
|
24 |