xfsprogs: update to latest stable, unbreak for uClibc-ng builds

5 files changed, 61 insertions, 29 deletions

diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index f8ce0786d..59a729cc3 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -4,20 +4,20 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		xfsprogs
-PKG_VERSION:=		3.1.11
+PKG_VERSION:=		4.3.0
 PKG_RELEASE:=		1
-PKG_HASH:=		adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be
+PKG_HASH:=		3e570ad51153e4be3792f42b2c805ddbd46b55d166eba3102ec87d5006d4cb5c
 PKG_DESCR:=		utilities for xfs filesystems
 PKG_SECTION:=		sys/fs
-PKG_BUILDDEP:=		e2fsprogs util-linux ncurses
-PKG_DEPENDS:=		libuuid libblkid libncurses
+PKG_BUILDDEP:=		e2fsprogs ncurses
+PKG_DEPENDS:=		libuuid libncurses
 PKG_NEEDS:=		threads rt
 PKG_URL:=		http://oss.sgi.com/projects/xfs
 PKG_SITES:=		ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
 			ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/
 
+PKG_NOPARALLEL:=	1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-PKG_LIBC_DEPENDS:=	glibc
 
 include ${ADK_TOPDIR}/mk/package.mk
 
@@ -26,8 +26,10 @@ $(eval $(call PKG_template,XFSPROGS,xfsprogs,${PKG_VERSION}-${PKG_RELEASE},${PKG
 INSTALL_STYLE:=		manual
 TARGET_LDFLAGS+=	-lrt
 CONFIGURE_ARGS+=	--enable-gettext=no \
+			--enable-blkid=no \
 			--with-gnu-ld
-CONFIGURE_ENV+=		DEBUG=" " OPTIMIZER=" " PLATFORM=linux
+CONFIGURE_ENV+=		DEBUG=" " OPTIMIZER=" " PLATFORM=linux \
+			ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes
 ALL_TARGET=
 
 do-install:
diff --git a/package/xfsprogs/patches/patch-copy_xfs_copy_c b/package/xfsprogs/patches/patch-copy_xfs_copy_c
index 5640d0625..2e98a5f54 100644
--- a/package/xfsprogs/patches/patch-copy_xfs_copy_c
+++ b/package/xfsprogs/patches/patch-copy_xfs_copy_c
@@ -1,8 +1,8 @@
---- xfsprogs-3.1.4.orig/copy/xfs_copy.c	2010-01-29 20:46:13.000000000 +0100
-+++ xfsprogs-3.1.4/copy/xfs_copy.c	2011-01-22 20:44:49.478658642 +0100
-@@ -240,6 +240,10 @@ handler(int sig)
+--- xfsprogs-4.3.0.orig/copy/xfs_copy.c	2015-10-15 23:31:26.000000000 +0200
++++ xfsprogs-4.3.0/copy/xfs_copy.c	2015-11-27 06:04:00.000000000 +0100
+@@ -236,6 +236,10 @@ handler(int sig)
  {
- 	pid_t	pid = getpid();
+ 	pid_t	pid;
  	int	status, i;
 +	struct sigaction action;
 +
@@ -11,7 +11,7 @@
  
  	pid = wait(&status);
  
-@@ -272,7 +276,7 @@ handler(int sig)
+@@ -268,7 +272,7 @@ handler(int sig)
  					pthread_exit(NULL);
  				}
  
@@ -20,7 +20,7 @@
  				return;
  			} else  {
  				/* it just croaked it bigtime, log it */
-@@ -294,7 +298,7 @@ handler(int sig)
+@@ -290,7 +294,7 @@ handler(int sig)
  	do_warn(_("%s: Unknown child died (should never happen!)\n"), progname);
  	die_perror();
  	pthread_exit(NULL);
@@ -29,7 +29,7 @@
  }
  
  void
-@@ -467,6 +471,11 @@ void
+@@ -466,6 +470,11 @@ void
  write_wbuf(void)
  {
  	int		i;
@@ -41,7 +41,7 @@
  
  	/* verify target threads */
  	for (i = 0; i < num_targets; i++)
-@@ -478,9 +487,9 @@ write_wbuf(void)
+@@ -477,9 +486,9 @@ write_wbuf(void)
  		if (target[i].state != INACTIVE)
  			pthread_mutex_unlock(&targ[i].wait);	/* wake up */
  
@@ -52,8 +52,8 @@
 +	sigprocmask(SIG_SETMASK, &initial, NULL);
  }
  
- 
-@@ -521,6 +530,12 @@ main(int argc, char **argv)
+ void
+@@ -551,6 +560,12 @@ main(int argc, char **argv)
  	libxfs_init_t	xargs;
  	thread_args	*tcarg;
  	struct stat64	statbuf;
@@ -66,7 +66,7 @@
  
  	progname = basename(argv[0]);
  
-@@ -846,8 +861,11 @@ main(int argc, char **argv)
+@@ -892,8 +907,11 @@ main(int argc, char **argv)
  
  	/* set up sigchild signal handler */
  
diff --git a/package/xfsprogs/patches/patch-fsr_xfs_fsr_c b/package/xfsprogs/patches/patch-fsr_xfs_fsr_c
index f220d0d14..c650575a1 100644
--- a/package/xfsprogs/patches/patch-fsr_xfs_fsr_c
+++ b/package/xfsprogs/patches/patch-fsr_xfs_fsr_c
@@ -1,14 +1,14 @@
---- xfsprogs-3.1.11.orig/fsr/xfs_fsr.c	2013-05-08 20:14:32.000000000 +0200
-+++ xfsprogs-3.1.11/fsr/xfs_fsr.c	2014-05-06 07:55:04.000000000 +0200
-@@ -35,7 +35,6 @@
+--- xfsprogs-4.3.0.orig/fsr/xfs_fsr.c	2015-11-23 05:24:24.000000000 +0100
++++ xfsprogs-4.3.0/fsr/xfs_fsr.c	2015-11-27 06:04:00.000000000 +0100
+@@ -30,7 +30,6 @@
+ #include <sys/ioctl.h>
  #include <sys/wait.h>
- #include <sys/vfs.h>
  #include <sys/statvfs.h>
 -#include <sys/xattr.h>
  
- 
  #ifndef XFS_XFLAG_NODEFRAG
-@@ -1034,6 +1033,7 @@ fsr_setup_attr_fork(
+ #define XFS_XFLAG_NODEFRAG 0x00002000 /* src dependancy, remove later */
+@@ -1044,6 +1043,7 @@ fsr_setup_attr_fork(
  	 * use the old method if we have attr1 or the kernel does not yet
  	 * support passing the fork offset in the bulkstat data.
  	 */
@@ -16,7 +16,7 @@
  	if (!(fsgeom.flags & XFS_FSOP_GEOM_FLAGS_ATTR2) ||
  	    bstatp->bs_forkoff == 0) {
  		/* attr1 */
-@@ -1044,6 +1044,7 @@ fsr_setup_attr_fork(
+@@ -1054,6 +1054,7 @@ fsr_setup_attr_fork(
  		}
  		goto out;
  	}
@@ -24,24 +24,24 @@
  
  	/* attr2 w/ fork offsets */
  
-@@ -1081,6 +1082,7 @@ fsr_setup_attr_fork(
+@@ -1095,6 +1096,7 @@ fsr_setup_attr_fork(
  		 * If there is no attribute, then we need to create one to get
  		 * an attribute fork at the default location.
  		 */
 +#if 0
  		if (!tbstat.bs_forkoff) {
+ 			ASSERT(i == 0);
  			ret = fsetxattr(tfd, name, "XX", 2, XATTR_CREATE);
- 			if (ret) {
-@@ -1089,7 +1091,7 @@ fsr_setup_attr_fork(
+@@ -1141,7 +1143,7 @@ fsr_setup_attr_fork(
+ 				continue;
  			}
- 			continue;
  		}
 -
 +#endif
  		/*
  		 * make a progress check so we don't get stuck trying to extend
  		 * a large btree form attribute fork.
-@@ -1128,11 +1130,13 @@ fsr_setup_attr_fork(
+@@ -1177,11 +1179,13 @@ fsr_setup_attr_fork(
  		}
  
  		/* we need to grow the attr fork, so create another attr */
diff --git a/package/xfsprogs/patches/patch-include_linux_h b/package/xfsprogs/patches/patch-include_linux_h
new file mode 100644
index 000000000..d7836e61e
--- /dev/null
+++ b/package/xfsprogs/patches/patch-include_linux_h
@@ -0,0 +1,10 @@
+--- xfsprogs-4.3.0.orig/include/linux.h	2015-11-10 20:54:46.000000000 +0100
++++ xfsprogs-4.3.0/include/linux.h	2015-11-27 06:29:33.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <errno.h>
+ #include <endian.h>
+ #include <stdbool.h>
++#include <stdio.h>
+ #include <asm/types.h>
+ #include <mntent.h>
+ 
diff --git a/package/xfsprogs/patches/patch-libxfs_Makefile b/package/xfsprogs/patches/patch-libxfs_Makefile
new file mode 100644
index 000000000..fc5b09f5e
--- /dev/null
+++ b/package/xfsprogs/patches/patch-libxfs_Makefile
@@ -0,0 +1,20 @@
+--- xfsprogs-4.3.0.orig/libxfs/Makefile	2015-09-22 03:42:41.000000000 +0200
++++ xfsprogs-4.3.0/libxfs/Makefile	2015-11-27 06:25:52.000000000 +0100
+@@ -111,7 +111,7 @@ default: crc32selftest ltdepend $(LTLIBR
+ 
+ crc32table.h: gen_crc32table.c
+ 	@echo "    [CC]     gen_crc32table"
+-	$(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $<
++	$(Q) $(BUILD_CC) $(GCFLAGS) -o gen_crc32table $<
+ 	@echo "    [GENERATE] $@"
+ 	$(Q) ./gen_crc32table > crc32table.h
+ 
+@@ -122,7 +122,7 @@ crc32table.h: gen_crc32table.c
+ # disk.
+ crc32selftest: gen_crc32table.c crc32table.h crc32.c
+ 	@echo "    [TEST]    CRC32"
+-	$(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
++	$(Q) $(BUILD_CC) $(GCFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
+ 	$(Q) ./$@
+ 
+ # set up include/xfs header directory