Bug#405564: apr: FTBFS on kfreebsd-amd64 (due to 020_lfs_ino_t.dpatch)

[Petr Salinger]

Package: apr
Severity: important
Version: 1.2.7-8.2
Version: 1.2.7-8
Tags: patch

Hi,

the current version fails to build on kfreebsd-amd64.

It is due to "Small kludge^Wtweak to apr_file_info.h"
introduced in 1.2.7-8.

Please find attached patch to fix that.
Both debian/patches/020_lfs_ino_t.dpatch
and debian/ino_t_test.c are updated/extended.

Thanks in advance,

        Petr
diff -ur debian/ino_t_test.c debian/ino_t_test.c
--- debian/ino_t_test.c 2007-01-04 14:51:01.000000000 +0100
+++ debian/ino_t_test.c 2007-01-04 15:10:59.000000000 +0100
@@ -2,7 +2,7 @@
 #include <sys/types.h>
 
 /* keep this in sync with the patch to apr_file_info.h */
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__FreeBSD_kernel__)
 typedef unsigned int              apr_ino_t;
 #else
 typedef unsigned long int         apr_ino_t;
diff -ur debian/patches/020_lfs_ino_t.dpatch debian/patches/020_lfs_ino_t.dpatch
--- debian/patches/020_lfs_ino_t.dpatch 2007-01-04 14:51:01.000000000 +0100
+++ debian/patches/020_lfs_ino_t.dpatch 2007-01-04 15:11:45.000000000 +0100
@@ -19,7 +19,7 @@
 -typedef ino_t                     apr_ino_t;
 +/* NOTE: this should be ino_t, except that in that case the ABI changes
 + * if you compile an app with LFS defines. */
-+#ifdef __alpha__
++#if defined(__alpha__) || defined(__FreeBSD_kernel__)
 +typedef unsigned int              apr_ino_t;
 +#else
 +typedef unsigned long int         apr_ino_t;