jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3841 from ebfe/xfsprogs

Browse source 
xfsprogs: update to 4.5.0.
This commit is contained in:
Enno Boland 2016-03-15 23:10:37 +01:00
commit f915a6863a
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
srcpkgs/xfsprogs/patches/musl-fixes.patch
View file

@ -11,11 +11,10 @@
char *progname; char *progname;
--- include/linux.h.orig 2015-08-04 01:37:12.000000000 +0200 --- include/linux.h.orig 2016-02-29 00:39:26.000000000 +0100
+++ include/linux.h 2015-10-03 21:19:02.256382607 +0200 +++ include/linux.h 2016-03-15 16:19:01.326430077 +0100
@@ -30,7 +30,9 @@ @@ -32,6 +32,8 @@
#include <endian.h> #include <stdio.h>
#include <stdbool.h>
#include <asm/types.h> #include <asm/types.h>
#include <mntent.h> #include <mntent.h>
+#include <linux/limits.h> /* XATTR_SIZE_MAX */ +#include <linux/limits.h> /* XATTR_SIZE_MAX */
@ -23,15 +22,15 @@
static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p) static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
{ {
@@ -140,6 +141,10 @@ @@ -142,6 +144,10 @@
#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */
#define EFSBADCRC EBADMSG /* Bad CRC detected */ #define EFSBADCRC EBADMSG /* Bad CRC detected */
+#ifndef loff_t +#ifndef off64_t
+#define loff_t off_t +#define off64_t off_t
+#endif +#endif
+ +
typedef loff_t xfs_off_t; typedef off64_t xfs_off_t;
typedef __uint64_t xfs_ino_t; typedef __uint64_t xfs_ino_t;
typedef __uint32_t xfs_dev_t; typedef __uint32_t xfs_dev_t;
--- libhandle/handle.c.orig 2015-10-03 21:15:14.890366562 +0200 --- libhandle/handle.c.orig 2015-10-03 21:15:14.890366562 +0200

4
srcpkgs/xfsprogs/template
View file

@ -1,6 +1,6 @@
# Template file for 'xfsprogs' # Template file for 'xfsprogs'
pkgname=xfsprogs pkgname=xfsprogs
version=4.3.0 version=4.5.0
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-readline=yes --enable-lib64=no" configure_args="--enable-readline=yes --enable-lib64=no"
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="LGPL-2.1" license="LGPL-2.1"
homepage="http://xfs.org/" homepage="http://xfs.org/"
distfiles="ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-${version}.tar.gz" distfiles="ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-${version}.tar.gz"
checksum=3e570ad51153e4be3792f42b2c805ddbd46b55d166eba3102ec87d5006d4cb5c checksum=e49beb314984efbd0d758abb5c6137db3bb60a88e59e1e94c00defb536cf89f8
do_install() { do_install() {
make install install-dev DIST_ROOT=${DESTDIR} \ make install install-dev DIST_ROOT=${DESTDIR} \