Skip to contentSkip to conversation

squashfs3: fix build with uClibc

PATCH New Markos Chandras 2 participants 2 messages Mar 15, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 squashfs3: fix build with uClibc

The squashfs3 package uses the old get_nprocs() GNU extension which does not exist in uClibc. This has already been fixed in newer squashfs releases (>=4.0). The patch is similar to the one committed in dfa2a513e1aa7f6ec47f630c5d31d98cd098f408

---
 package/squashfs3/squashfs3-3.4-get_nprocs.patch |   26 ++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)
 create mode 100644 package/squashfs3/squashfs3-3.4-get_nprocs.patch
package/squashfs3/squashfs3-3.4-get_nprocs.patch new file +26 -0
new file mode 100644
index 0000000..e6901de
@@ -0,0 +1,26 @@
+Index: squashfs3-3.4/squashfs-tools/mksquashfs.c
+===================================================================
+--- squashfs3-3.4.orig/squashfs-tools/mksquashfs.c
++++ squashfs3-3.4/squashfs-tools/mksquashfs.c
+@@ -3178,7 +3178,7 @@ void initialise_threads()
+ 			processors = 1;
+ 		}
+ #else
+-		processors = get_nprocs();
++		processors = sysconf(_SC_NPROCESSORS_CONF);
+ #endif
+ 	}
+ 
+Index: squashfs3-3.4/squashfs-tools/unsquashfs.c
+===================================================================
+--- squashfs3-3.4.orig/squashfs-tools/unsquashfs.c
++++ squashfs3-3.4/squashfs-tools/unsquashfs.c
+@@ -2428,7 +2428,7 @@ void initialise_threads(int fragment_buf
+ 			processors = 1;
+ 		}
+ #else
+-		processors = get_nprocs();
++		processors = sysconf(_SC_NPROCESSORS_CONF);
+ #endif
+ 	}
+ 
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 squashfs3: fix build with uClibc

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Markos" == Markos Chandras <[email protected]> writes:

Markos> The squashfs3 package uses the old get_nprocs() GNU extension Markos> which does not exist in uClibc. This has already been fixed in Markos> newer squashfs releases (>=4.0). The patch is similar to the Markos> one committed in dfa2a513e1aa7f6ec47f630c5d31d98cd098f408

Committed, thanks.

Markos> Signed-off-by: Markos Chandras <[email protected]> Markos> ---

 Markos>  package/squashfs3/squashfs3-3.4-get_nprocs.patch |   26 ++++++++++++++++++++++

Markos> 1 files changed, 26 insertions(+), 0 deletions(-) Markos> create mode 100644 package/squashfs3/squashfs3-3.4-get_nprocs.patch

Markos> diff --git a/package/squashfs3/squashfs3-3.4-get_nprocs.patch b/package/squashfs3/squashfs3-3.4-get_nprocs.patch Markos> new file mode 100644
Markos> index 0000000..e6901de

For the future, don't forget to add a git-style description of the patch with your signed-off-by. This time I copied (most of) you commit message over.

Markos> --- /dev/null
Markos> +++ b/package/squashfs3/squashfs3-3.4-get_nprocs.patch Markos> @@ -0,0 +1,26 @@
Markos> +Index: squashfs3-3.4/squashfs-tools/mksquashfs.c Markos> +=================================================================== Markos> +--- squashfs3-3.4.orig/squashfs-tools/mksquashfs.c Markos> ++++ squashfs3-3.4/squashfs-tools/mksquashfs.c
Markos> +@@ -3178,7 +3178,7 @@ void initialise_threads()
Markos> + processors = 1;
Markos> + }
Markos> + #else
Markos> +- processors = get_nprocs();
Markos> ++ processors = sysconf(_SC_NPROCESSORS_CONF);
Markos> + #endif
Markos> + }
Markos> +

Signature · 1 line
Bye, Peter Korsgaard