From: Mike Gilbert <floppym@gentoo.org>
Date: Sun, 7 Jan 2018 17:08:31 +0000 (-0500)
Subject: sys-fs/e2fsprogs: fix build on big endian
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4f6eacce878ca6eaed9a72f57826de872704f294;p=gentoo.git

sys-fs/e2fsprogs: fix build on big endian

Closes: https://bugs.gentoo.org/643570
Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37
---

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.8.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.8.ebuild
index ba0347721fd7..3637e695028a 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.8.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.8.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
 
 	# Upstream patches (can usually removed with next version bump)
+	"${FILESDIR}"/${PN}-1.43.8-big-endian.patch
 )
 
 src_prepare() {
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.43.8-big-endian.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.43.8-big-endian.patch
new file mode 100644
index 000000000000..8b3482f6d5fd
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.43.8-big-endian.patch
@@ -0,0 +1,37 @@
+From 876d9b0c8eac2fd80dd62bfa1b09adea62aa08f3 Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Wed, 3 Jan 2018 01:32:02 -0500
+Subject: libext2fs: fix build failure in swapfs.c on big-endian systems
+
+Addresses-Debian-Bug: #886119
+
+Reported-by: James Clarke <jrtc27@debian.org>
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+---
+ lib/ext2fs/swapfs.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c
+index 6e5cff9..b13dc42 100644
+--- a/lib/ext2fs/swapfs.c
++++ b/lib/ext2fs/swapfs.c
+@@ -19,6 +19,7 @@
+ 
+ #include "ext2_fs.h"
+ #include "ext2fs.h"
++#include "ext2fsP.h"
+ #include <ext2fs/ext2_ext_attr.h>
+ 
+ #ifdef WORDS_BIGENDIAN
+@@ -358,7 +359,7 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
+ 	if (inode_includes(inode_size, i_projid))
+                 t->i_projid = ext2fs_swab16(f->i_projid);
+ 	/* catch new static fields added after i_projid */
+-	EXT2FS_BUILD_BUG_ON(sizeof(ext2_inode_large) != 160);
++	EXT2FS_BUILD_BUG_ON(sizeof(struct ext2_inode_large) != 160);
+ 
+ 	i = sizeof(struct ext2_inode) + extra_isize + sizeof(__u32);
+ 	if (bufsize < (int) i)
+-- 
+cgit v1.1
+