Commit dfa2a513 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

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: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 4f3f291a

CHANGES

+2 −2
Original line number Diff line number Diff line
@@ -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

package/squashfs/squashfs-4.0-mksquashfs-get_nprocs.patch

0 → 100644
+37 −0
Original line number Diff line number Diff line 
[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

 	}