Mercurial > hg > aboriginal

annotate sources/patches/squashfs-tools-4.0-uclibc-get_nprocs.patch @ 912:505e0d613464

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
author Rob Landley <rob@landley.net>
date Wed, 02 Dec 2009 19:07:29 -0600
parents
children 4e798d7aa5f9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
912
505e0d613464 Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff changeset
1 --- 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
2 +++ 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
3 @@ -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
4 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
5 }
505e0d613464 Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff changeset
6 #else
505e0d613464 Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff changeset
7 - 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
8 + 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
9 #endif
505e0d613464 Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff changeset
10 }
505e0d613464 Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff changeset
11
505e0d613464 Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff changeset
12 --- 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
13 +++ 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
14 @@ -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
15 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
16 }
505e0d613464 Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff changeset
17 #else
505e0d613464 Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff changeset
18 - 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
19 + 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
20 #endif
505e0d613464 Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff changeset
21 }
505e0d613464 Squashfs doesn't build against uClibc 0.9.30.1, fix from Natanael Copa.
Rob Landley <rob@landley.net>
parents:
diff changeset
22