Bug#557174: squashfs-tools: FTBFS on GNU/kFreeBSD

[Cyril Brulebois]

Package: squashfs-tools
Version: 4.0-4
Severity: important
Tags: patch
User: debian-...@lists.debian.org
Usertags: kfreebsd

Hi,

please find attached a tiny patch to fix the FTBFS of your package
on GNU/kFreeBSD. Essentially fixes redefinition issues.

Thanks for considering.

Mraw,
KiBi.

only in patch2:
unchanged:
--- squashfs-tools-4.0.orig/squashfs-tools/swap.c
+++ squashfs-tools-4.0/squashfs-tools/swap.c
@@ -19,7 +19,7 @@
  * swap.c
  */
 
-#ifndef linux
+#if !defined(linux) && !defined(__GLIBC__)
 #define __BYTE_ORDER BYTE_ORDER
 #define __BIG_ENDIAN BIG_ENDIAN
 #define __LITTLE_ENDIAN LITTLE_ENDIAN
only in patch2:
unchanged:
--- squashfs-tools-4.0.orig/squashfs-tools/unsquashfs.h
+++ squashfs-tools-4.0/squashfs-tools/unsquashfs.h
@@ -45,7 +45,7 @@
 #include <sys/ioctl.h>
 #include <sys/time.h>
 
-#ifndef linux
+#if !defined(linux) && !defined(__GLIBC__)
 #define __BYTE_ORDER BYTE_ORDER
 #define __BIG_ENDIAN BIG_ENDIAN
 #define __LITTLE_ENDIAN LITTLE_ENDIAN
only in patch2:
unchanged:
--- squashfs-tools-4.0.orig/squashfs-tools/mksquashfs.c
+++ squashfs-tools-4.0/squashfs-tools/mksquashfs.c
@@ -48,7 +48,7 @@
 #include <regex.h>
 #include <fnmatch.h>
 
-#ifndef linux
+#if !defined(linux) && !defined(__GLIBC__)
 #define __BYTE_ORDER BYTE_ORDER
 #define __BIG_ENDIAN BIG_ENDIAN
 #define __LITTLE_ENDIAN LITTLE_ENDIAN
@@ -3688,7 +3688,7 @@
 	signal(SIGUSR1, sigusr1_handler);
 
 	if(processors == -1) {
-#ifndef linux
+#if !defined(linux) && !defined(__GLIBC__)
 		int mib[2];
 		size_t len = sizeof(processors);
 
only in patch2:
unchanged:
--- squashfs-tools-4.0.orig/squashfs-tools/unsquashfs.c
+++ squashfs-tools-4.0/squashfs-tools/unsquashfs.c
@@ -1794,7 +1794,7 @@
 			"\n");
 
 	if(processors == -1) {
-#ifndef linux
+#if !defined(linux) && !defined(__GLIBC__)
 		int mib[2];
 		size_t len = sizeof(processors);
 
only in patch2:
unchanged:
--- squashfs-tools-4.0.orig/squashfs-tools/read_fs.c
+++ squashfs-tools-4.0/squashfs-tools/read_fs.c
@@ -39,7 +39,7 @@
 #include <zlib.h>
 #include <sys/mman.h>
 
-#ifndef linux
+#if !defined(linux) && !defined(__GLIBC__)
 #define __BYTE_ORDER BYTE_ORDER
 #define __BIG_ENDIAN BIG_ENDIAN
 #define __LITTLE_ENDIAN LITTLE_ENDIAN