summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-06-17 20:45:22 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-06-17 20:45:22 (GMT)
commitdfa2a513e1aa7f6ec47f630c5d31d98cd098f408 (patch)
tree901e8de214b3fb3145feffa4534bcd28d2642079
parent4f3f291a3bfc1893cbfb4d9803c35a4f6752784d (diff)
downloadbuildroot-dfa2a513e1aa7f6ec47f630c5d31d98cd098f408.tar.gz
buildroot-dfa2a513e1aa7f6ec47f630c5d31d98cd098f408.tar.bz2
squashfs: fix build with uClibc
squashfs used the get_nprocs() GNU extension, instead of directly calling sysconf(), breaking the build on uClibc. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES4
-rw-r--r--package/squashfs/squashfs-4.0-mksquashfs-get_nprocs.patch37
2 files changed, 39 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 0b1dde9..c9cf1e0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,8 +15,8 @@
Updated/fixed packages: busybox, cdrkit, file, gawk,
gstreamer, intltool, ipsec-tools, iptables, libart, libidn,
- lmbench, lrzsz, netperf, openssl, php, qt, sqlite, tn5250,
- usbutils, xkeyboard-config
+ lmbench, lrzsz, netperf, openssl, php, qt, sqlite, squashfs,
+ tn5250, usbutils, xkeyboard-config
Removed packages: modutils
diff --git a/package/squashfs/squashfs-4.0-mksquashfs-get_nprocs.patch b/package/squashfs/squashfs-4.0-mksquashfs-get_nprocs.patch
new file mode 100644
index 0000000..8a19923
--- /dev/null
+++ b/package/squashfs/squashfs-4.0-mksquashfs-get_nprocs.patch
@@ -0,0 +1,37 @@
+[PATCH] squashfs-tools: Don't use get_nprocs()
+
+get_nprocs() is a GNU extension, not supported on E.G. uClibc. It is a
+simple wrapper around sysconf(_SC_NPROCESSORS_CONF), so use that instead.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ squashfs-tools/mksquashfs.c | 2 +-
+ squashfs-tools/unsquashfs.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: squashfs4.0/squashfs-tools/mksquashfs.c
+===================================================================
+--- squashfs4.0.orig/squashfs-tools/mksquashfs.c
++++ squashfs4.0/squashfs-tools/mksquashfs.c
+@@ -3705,7 +3705,7 @@ void initialise_threads()
+ processors = 1;
+ }
+ #else
+- processors = get_nprocs();
++ processors = sysconf(_SC_NPROCESSORS_CONF);
+ #endif
+ }
+
+Index: squashfs4.0/squashfs-tools/unsquashfs.c
+===================================================================
+--- squashfs4.0.orig/squashfs-tools/unsquashfs.c
++++ squashfs4.0/squashfs-tools/unsquashfs.c
+@@ -1811,7 +1811,7 @@ void initialise_threads(int fragment_buf
+ processors = 1;
+ }
+ #else
+- processors = get_nprocs();
++ processors = sysconf(_SC_NPROCESSORS_CONF);
+ #endif
+ }
+