Package: funnelweb
Severity: important
Tags: patch
Hi,
currently your package FTBFS on GNU/kFreeBSD with the following errors:
> dh_testdir
> (cd source && gcc -g -O2 -Wall -fno-strict-aliasing -c *.c && gcc -g -O2
> -Wall -fno-strict-aliasing -o fw *.o)
> In file included from style.h:93,
> from analyse.c:42:
> environ.h:216:5: error: #error Error: No operating system class has been
> selected.
> In file included from option.h:49,
> from data.h:73,
> from analyse.c:46:
> machin.h:177:5: error: #error COMLINE_MAX must be at least 300.
> In file included from option.h:49,
> from data.h:73,
> from analyse.c:46:
> [...]
Full build logs are available at
<http://experimental.ftbfs.de/build.php?arch=kfreebsd-i386&pkg=funnelweb>.
Please find attached a patch to add support for GNU/kFreeBSD by
adjusting some #if tests and some #defines.
Cheers,
--
Cyril Brulebois
--- funnelweb-3.2/source/environ.h 2007-03-08 17:37:13.089555000 +0100
+++ funnelweb-3.2/source/environ.h 2007-03-08 17:42:15.000000000 +0100
@@ -84,6 +84,7 @@
#define OS_L86 0 /* Linux */
#define OS_AIX 0 /* AIX */
#define OS_FBD 0 /* FreeBSD */
+#define OS_GKB 0 /* GNU/kFreeBSD */
#ifdef THINK_C
@@ -198,6 +199,14 @@
#endif
+#ifdef __FreeBSD_kernel__
+#undef OS_UNX
+#define OS_UNX 1
+#undef OS_GKB
+#define OS_GKB 1
+#endif
+
+
#ifdef _AIX
#undef OS_UNX
#define OS_UNX 1
@@ -222,7 +231,7 @@
#if OS_UNX
#define OS_UNXSUM1 (OS_HPU+OS_OSF+OS_SUN+OS_SOL+OS_ULT)
-#define OS_UNXSUM2 (OS_IRX+OS_B86+OS_L86+OS_AIX+OS_FBD)
+#define OS_UNXSUM2 (OS_IRX+OS_B86+OS_L86+OS_AIX+OS_FBD+OS_GKB)
#if ((OS_UNXSUM1+OS_UNXSUM2) != 1)
#error Error: Exactly one Unix operating system must be chosen.
#endif
--- funnelweb-3.2/source/style.h 2007-03-08 17:44:03.295140000 +0100
+++ funnelweb-3.2/source/style.h 2007-03-08 17:44:30.000000000 +0100
@@ -118,7 +118,7 @@
/* Some (but not all) IRIX header files already typedef ulong so we have to */
/* create a form of definition for this symbol that won't collide. */
-#if OS_IRX || OS_L86 || OS_AIX
+#if OS_IRX || OS_L86 || OS_AIX || OS_GKB
#define ulong unsigned long
#else
typedef unsigned long ulong ; /* Unsigned, [0,(2^32)-1]. */
