diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2018-01-09 07:30:42 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2018-01-09 07:30:42 +0000 |
| commit | b0d8276420c48afe1a77bca92ff711a532ced78b (patch) | |
| tree | 461321659be2d0874f81829831845ed5412e8d5a | |
| parent | 0479331fce8be1daed129a08829001a0ff13dd3f (diff) | |
| download | aports-b0d8276420c48afe1a77bca92ff711a532ced78b.tar.bz2 aports-b0d8276420c48afe1a77bca92ff711a532ced78b.tar.xz | |
main/e2fsprogs: build fix for s390x
| -rw-r--r-- | main/e2fsprogs/APKBUILD | 11 | ||||
| -rw-r--r-- | main/e2fsprogs/swapfs-big-endian-FTBFS.patch | 19 |
2 files changed, 26 insertions, 4 deletions
diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD index 9415ed321b..4c4c8796ee 100644 --- a/main/e2fsprogs/APKBUILD +++ b/main/e2fsprogs/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=e2fsprogs pkgver=1.43.8 -pkgrel=0 +pkgrel=1 pkgdesc="Standard Ext2/3/4 filesystem utilities" url="http://e2fsprogs.sourceforge.net" arch="all" @@ -12,9 +12,11 @@ depends_dev="util-linux-dev" options="!check" makedepends="$depends_dev linux-headers" subpackages="$pkgname-dev $pkgname-doc libcom_err $pkgname-libs $pkgname-extra" -source="https://www.kernel.org/pub/linux/kernel/people/tytso/$pkgname/v$pkgver/$pkgname-$pkgver.tar.xz" - +source="https://www.kernel.org/pub/linux/kernel/people/tytso/$pkgname/v$pkgver/$pkgname-$pkgver.tar.xz + swapfs-big-endian-FTBFS.patch + " builddir="$srcdir/$pkgname-$pkgver" + build () { cd "$builddir" ./configure \ @@ -65,4 +67,5 @@ extra() { mv "$pkgdir"/usr "$subpkgdir"/ } -sha512sums="539f310909aafcd40062da067c94d3b355bdecee122ecb5ea53e137f57e8699bd4d549a7f161c796d9a3d7a7b5822e8c01b47e4babdeb7243eb64a022dda2f74 e2fsprogs-1.43.8.tar.xz" +sha512sums="539f310909aafcd40062da067c94d3b355bdecee122ecb5ea53e137f57e8699bd4d549a7f161c796d9a3d7a7b5822e8c01b47e4babdeb7243eb64a022dda2f74 e2fsprogs-1.43.8.tar.xz +7e653a7e0c8ba8335193ee888e71a9aea50622733b2a284d5233b20b1afa8208da5cd678baae8d43eefb629c95cf68f3166f3281de77c2d33c2c487e6f389563 swapfs-big-endian-FTBFS.patch" diff --git a/main/e2fsprogs/swapfs-big-endian-FTBFS.patch b/main/e2fsprogs/swapfs-big-endian-FTBFS.patch new file mode 100644 index 0000000000..fee4e0dbce --- /dev/null +++ b/main/e2fsprogs/swapfs-big-endian-FTBFS.patch @@ -0,0 +1,19 @@ +--- 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 + 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) |