Resolve build issues on Debian GNU/kFreeBSD port.

Additional platform target added to build system, with similar
build options to Linux but ultimately making BSD syscalls (and
hence leveragin the existing FreeBSD port in places too).

Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Nathan Scott <nathans@debian.org>
Signed-off-by: Nathan Scott <nathans@debian.org>

diff --git a/include/builddefs.in b/include/builddefs.in
index cc75b5d292071ef17f9705b95a98f2cfec8a0d36..2c5b51c8277ad828ecea95fa680c8ea5a8915bed 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -105,6 +105,9 @@ ifeq ($(PKG_PLATFORM),linux)
 PCFLAGS = -D_GNU_SOURCE -D_XOPEN_SOURCE=500 -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__

diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in
index 4f8ebe586016df877c94fdad24c53852bc9c30e7..0196cc4436f9b0db4f476aeb2ddd76c06fc77ac6 100644 (file)
--- a/include/platform_defs.h.in
+++ b/include/platform_defs.h.in
@@ -66,6 +66,8 @@ typedef struct filldir                filldir_t;
 #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)

diff --git a/libxfs/freebsd.c b/libxfs/freebsd.c
index 63a88ba59faa95616010ccdb91ba27c7cb161dc1..e278f97e8e5b178d151b17a78fdd8e1968cb8b5b 100644 (file)
--- a/libxfs/freebsd.c
+++ b/libxfs/freebsd.c
@@ -29,12 +29,12 @@ extern char *progname;
 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;
        }

diff --git a/m4/package_globals.m4 b/m4/package_globals.m4
index 415564b9b1c6b603a009b7f94875c8a90b860d66..e469671c8dea20c8f88175a1a745d6e760943b17 100644 (file)
--- a/m4/package_globals.m4
+++ b/m4/package_globals.m4
@@ -41,7 +41,7 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
     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)
   ])