Package: xfsprogs
Severity: important
Version: 2.9.8-1
Tags: patch
User: [EMAIL PROTECTED]
Usertags: kfreebsd
Hi,
the current version fails to build on GNU/kFreeBSD.
The xfsprogs already supports FreeBSD,
so porting is relatively easy.
Please apply attached patch and run
aclocal-1.9 -I m4
autoconf
It would also be nice if you can ask upstream
to include this changes.
Thanks in advance
Petr--- xfsprogs-2.9.8.orig/include/platform_defs.h.in
+++ xfsprogs-2.9.8/include/platform_defs.h.in
@@ -53,6 +53,8 @@
#include <xfs/linux.h>
#elif defined(__FreeBSD__)
#include <xfs/freebsd.h>
+#elif defined(__FreeBSD_kernel__)
+#include <xfs/gnukfreebsd.h>
#elif defined(__APPLE__)
#include <xfs/darwin.h>
#elif defined(__sgi__) || defined(__sgi)
--- xfsprogs-2.9.8.orig/include/builddefs.in
+++ xfsprogs-2.9.8/include/builddefs.in
@@ -99,6 +99,9 @@
PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(GCCFLAGS)
DEPENDFLAGS = -D__linux__
endif
+ifeq ($(PKG_PLATFORM), gnukfreebsd)
+PCFLAGS = -D_GNU_SOURCE $(GCCFLAGS)
+endif
ifeq ($(PKG_PLATFORM),darwin)
PCFLAGS = -traditional-cpp $(GCCFLAGS)
DEPENDFLAGS = -D__APPLE__
--- xfsprogs-2.9.8.orig/include/gnukfreebsd.h
+++ xfsprogs-2.9.8/include/gnukfreebsd.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2004-2006 Silicon Graphics, Inc.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#ifndef __XFS_KFREEBSD_H__
+#define __XFS_KFREEBSD_H__
+
+#include <uuid/uuid.h>
+#include <sys/vfs.h>
+#include <sys/ioctl.h>
+#include <sys/sysmacros.h>
+#include <malloc.h>
+#include <getopt.h>
+#include <endian.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <sys/mount.h>
+#include <ctype.h>
+#include <libgen.h>
+#include <paths.h>
+#include <xfs/swab.h>
+
+#define constpp char * const *
+
+#define EFSCORRUPTED 990 /* Filesystem is corrupted */
+
+typedef off_t xfs_off_t;
+typedef __uint64_t xfs_ino_t;
+typedef __uint32_t xfs_dev_t;
+typedef __int64_t xfs_daddr_t;
+typedef char* xfs_caddr_t;
+typedef off_t loff_t;
+
+#ifndef _UCHAR_T_DEFINED
+typedef unsigned char uchar_t;
+#define _UCHAR_T_DEFINED 1
+#endif
+typedef enum { B_FALSE,B_TRUE } boolean_t;
+
+#define HAVE_FID 1
+
+static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
+{
+ return ioctl(fd, cmd, p);
+}
+
+static __inline__ int platform_test_xfs_fd(int fd)
+{
+ struct statfs buf;
+ if (fstatfs(fd, &buf) < 0)
+ return 0;
+ return strncmp(buf.f_fstypename, "xfs", 4) == 0;
+}
+
+static __inline__ int platform_test_xfs_path(const char *path)
+{
+ struct statfs buf;
+ if (statfs(path, &buf) < 0)
+ return 0;
+ return strncmp(buf.f_fstypename, "xfs", 4) == 0;
+}
+
+static __inline__ int platform_fstatfs(int fd, struct statfs *buf)
+{
+ return fstatfs(fd, buf);
+}
+
+static __inline__ void platform_getoptreset(void)
+{
+ extern int optind;
+ optind = 0;
+}
+
+static __inline__ int platform_uuid_compare(uuid_t *uu1, uuid_t *uu2)
+{
+ return uuid_compare(*uu1, *uu2);
+}
+
+static __inline__ void platform_uuid_unparse(uuid_t *uu, char *buffer)
+{
+ uuid_unparse(*uu, buffer);
+}
+
+static __inline__ int platform_uuid_parse(char *buffer, uuid_t *uu)
+{
+ return uuid_parse(buffer, *uu);
+}
+
+static __inline__ int platform_uuid_is_null(uuid_t *uu)
+{
+ return uuid_is_null(*uu);
+}
+
+static __inline__ void platform_uuid_generate(uuid_t *uu)
+{
+ uuid_generate(*uu);
+}
+
+static __inline__ void platform_uuid_clear(uuid_t *uu)
+{
+ uuid_clear(*uu);
+}
+
+static __inline__ void platform_uuid_copy(uuid_t *dst, uuid_t *src)
+{
+ uuid_copy(*dst, *src);
+}
+
+#endif /* __XFS_KFREEBSD_H__ */
--- xfsprogs-2.9.8.orig/libxfs/freebsd.c
+++ xfsprogs-2.9.8/libxfs/freebsd.c
@@ -29,12 +29,12 @@
int
platform_check_ismounted(char *name, char *block, struct stat64 *s, int
verbose)
{
- struct stat st;
+ struct stat64 st;
int cnt, i;
struct statfs *fsinfo;
if (!s) {
- if (stat(block, &st) < 0)
+ if (stat64(block, &st) < 0)
return 0;
s = &st;
}
--- xfsprogs-2.9.8.orig/libxfs/gnukfreebsd.c
+++ xfsprogs-2.9.8/libxfs/gnukfreebsd.c
@@ -0,0 +1 @@
+#include "freebsd.c"
--- xfsprogs-2.9.8.orig/quota/gnukfreebsd.c
+++ xfsprogs-2.9.8/quota/gnukfreebsd.c
@@ -0,0 +1 @@
+#include "freebsd.c"
--- xfsprogs-2.9.8.orig/m4/package_globals.m4
+++ xfsprogs-2.9.8/m4/package_globals.m4
@@ -39,7 +39,7 @@
test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION"
AC_SUBST(pkg_distribution)
- pkg_platform=`uname -s | tr 'A-Z' 'a-z' | sed -e 's/irix64/irix/'`
+ pkg_platform=`uname -s | tr 'A-Z' 'a-z' | tr -d / | sed -e
's/irix64/irix/'`
test -z "$PLATFORM" || pkg_platform="$PLATFORM"
AC_SUBST(pkg_platform)
])
--- xfsprogs-2.9.8.orig/m4/package_libcdev.m4
+++ xfsprogs-2.9.8/m4/package_libcdev.m4
@@ -58,6 +58,9 @@
#define _GNU_SOURCE
#define _FILE_OFFSET_BITS 64
#include <sys/sendfile.h>
+#ifdef __stub_sendfile
+#error sendfile is not implemented and will always fail
+#endif
], [
sendfile(0, 0, 0, 0);
], have_sendfile=yes
