xfsprogs: fix glibc 2.27 build

This commit is contained in:
Fredrik Rinnestam 2018-02-04 17:20:39 +01:00
parent 6a1554cabb
commit 2c390b10fa
4 changed files with 29 additions and 3 deletions

View File

@ -1 +1,2 @@
b1f01b84b7914526c55c985cbfc94964 copy_file_range.patch
2d50e3751cc98e6c9364bc3d2297b9fd xfsprogs-4.14.0.tar.xz

View File

@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/bHKbCcaohyTH+zUVI/r4vzYJMNiAF1PDKrPBIvKJ5Xm80Lq7VN3PJC3+uohMLQJbQ3UILkSwDL+p583osK+aQM=
SHA256 (Pkgfile) = 4958e8312908f5524a979eb93ff55399f5e18f1f83691e8f6d05c9fd83e60a24
RWSE3ohX2g5d/TYkqzsbv5kcMx3DCi6AzGKMZZD7KLmhn4vfBGVhAvUWgnlc1e5U3bUYCaVdVI3XFwJtlUjBO8Ii24V5mPkU/w0=
SHA256 (Pkgfile) = 170bc91fdd244fc1e01efcbdb0a46a7d72f72e202ab9e49952601ced557a17aa
SHA256 (.footprint) = 2a99d711e3ce2299b6c710812c6bf734d0cb498fb5173f960ed52270ed74e027
SHA256 (xfsprogs-4.14.0.tar.xz) = b1b710b268bc95d6f45eca06e1262c29eb38865a19cd4404e48ba446e043b7ec
SHA256 (copy_file_range.patch) = c3f4795e5d1c2269f5a20a296c2bb4740092a8eb9ef86c6a1956132e8b72adde

View File

@ -6,11 +6,14 @@
name=xfsprogs
version=4.14.0
release=1
source=(https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/$name-$version.tar.xz)
source=(https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/$name-$version.tar.xz \
copy_file_range.patch)
build() {
cd $name-$version
patch -p1 -i $SRC/copy_file_range.patch
make configure
export DEBUG=-DNDEBUG

View File

@ -0,0 +1,21 @@
diff -rupN xfsprogs-4.14.0-orig/io/copy_file_range.c xfsprogs-4.14.0/io/copy_file_range.c
--- xfsprogs-4.14.0-orig/io/copy_file_range.c 2018-02-04 13:05:59.235269459 +0100
+++ xfsprogs-4.14.0/io/copy_file_range.c 2018-02-04 13:06:26.574859151 +0100
@@ -43,7 +43,7 @@ copy_range_help(void)
}
static loff_t
-copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len)
+xfs_copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len)
{
loff_t ret;
@@ -130,7 +130,7 @@ copy_range_f(int argc, char **argv)
copy_dst_truncate();
}
- ret = copy_file_range(fd, &src, &dst, len);
+ ret = xfs_copy_file_range(fd, &src, &dst, len);
close(fd);
return ret;
}