Package: iozone3
Version: 429-2
Severity: serious
Tags: patch
User: debian-bsd@lists.debian.org
Usertags: kfreebsd

Hi,

Please find an updated kfreebsd.diff attached to fix this FTBFS.
https://buildd.debian.org/status/fetch.php?pkg=iozone3&arch=kfreebsd-amd64&ver=429-2&stamp=1412025882

It refreshes the kfreebsd make target, and also adds missing
include files.  The following change to debian/rules is also
needed to ensure the custom kfreebsd target is used:

--- debian/rules.orig   2014-10-01 02:46:26.298733523 +0100
+++ debian/rules        2014-10-01 02:44:00.038732602 +0100
@@ -18,7 +18,7 @@
         target = linux-sparc
     endif
 else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
-    target = freebsd
+    target = kfreebsd
 else
     target = generic
 endif

Thanks.

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable')
Architecture: kfreebsd-amd64 (x86_64)

Kernel: kFreeBSD 9.0-2-amd64-xenhvm-ipsec
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Description: Enable building on kfreebsd
Author: Christoph Egger <christ...@debian.org>
Bug: 640159
Forwarded: no


--- a/src/current/iozone.c
+++ b/src/current/iozone.c
@@ -287,10 +287,10 @@
 #include <unistd.h>
 
 #include <fcntl.h>
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__DragonFly__)
+#if !defined(__FreeBSD_kernel__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__DragonFly__)
 #include <malloc.h>
 #endif
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__)
+#if defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__)
 #include <stdlib.h>
 #include <string.h>
 #endif
--- a/src/current/makefile
+++ b/src/current/makefile
@@ -494,6 +494,12 @@
 	$(CC)  -O fileop_freebsd.o -o fileop
 	$(CC)  -O pit_server.o -o pit_server
 
+kfreebsd:        iozone_freebsd.o libbif.o fileop_freebsd.o libasync.o pit_server.o
+	$(CC) $(LDFLAGS) iozone_freebsd.o libbif.o -lpthread -lrt libasync.o \
+	        -o iozone
+	$(CC)  -O fileop_freebsd.o -o fileop
+	$(CC)  -O pit_server.o -o pit_server
+
 #
 # GNU C compiler DragonFly build with no threads, no largefiles
 #

Reply via email to