Package: libibverbs Version: 1.1.2-1 Severity: important Tags: patch User: glibc-bsd-de...@lists.alioth.debian.org Usertags: kfreebsd
Hi folks, GNU/kFreeBSD finally reached the archive, and we're in the process of bootstrapping it. Unfortunately, we still don't have sbuild because of schroot, boost, mpi, and libibverbs. It would be very nice if you could upload a fixed version ASAP, so that we can continue getting more and more packages. I could take care of it through an NMU if you lack time to take care of it. Once libibverbs fixed, libopenmpi-dev becomes installable, we can build mpi-defaults, and then we'll be able to consider boost. Please find attached a proposed diff. A better way to fix this problem could be found, I've asked for comments on the -bsd list, and I'll provide you with an updated patch through a minor bug if something comes up. Mraw, KiBi.
diff -u libibverbs-1.1.2/debian/rules libibverbs-1.1.2/debian/rules --- libibverbs-1.1.2/debian/rules +++ libibverbs-1.1.2/debian/rules @@ -8,2 +8,3 @@ include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/autotools.mk diff -u libibverbs-1.1.2/debian/changelog libibverbs-1.1.2/debian/changelog --- libibverbs-1.1.2/debian/changelog +++ libibverbs-1.1.2/debian/changelog @@ -1,3 +1,15 @@ +libibverbs (1.1.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS on GNU/kFreeBSD by alternatively including <sys/types.h> + when not on a Linux platform, and then defining __(s|u)(8|16|32|64) + using (|u_)int(8|16|32|64)_t: + - Include simple-patchsys.mk from debian/rules. + - Add the following patch: + + debian/patches/fix-ftbfs-on-gnu-kfreebsd.diff + + -- Cyril Brulebois <k...@debian.org> Tue, 30 Jun 2009 19:11:11 +0200 + libibverbs (1.1.2-1) unstable; urgency=low * New upstream release. only in patch2: unchanged: --- libibverbs-1.1.2.orig/debian/patches/fix-ftbfs-on-gnu-kfreebsd.diff +++ libibverbs-1.1.2/debian/patches/fix-ftbfs-on-gnu-kfreebsd.diff @@ -0,0 +1,44 @@ +--- a/include/infiniband/kern-abi.h ++++ b/include/infiniband/kern-abi.h +@@ -35,7 +35,19 @@ + #ifndef KERN_ABI_H + #define KERN_ABI_H + ++#if __linux + #include <linux/types.h> ++#else ++#include <sys/types.h> ++#define __u64 u_int64_t ++#define __s64 int64_t ++#define __u32 u_int32_t ++#define __s32 int32_t ++#define __u16 u_int16_t ++#define __s16 int16_t ++#define __u8 u_int8_t ++#define __s8 int8_t ++#endif + + /* + * This file must be kept in sync with the kernel's version of +--- a/include/infiniband/sa-kern-abi.h ++++ b/include/infiniband/sa-kern-abi.h +@@ -33,7 +33,19 @@ + #ifndef INFINIBAND_SA_KERN_ABI_H + #define INFINIBAND_SA_KERN_ABI_H + ++#if __linux + #include <linux/types.h> ++#else ++#include <sys/types.h> ++#define __u64 u_int64_t ++#define __s64 int64_t ++#define __u32 u_int32_t ++#define __s32 int32_t ++#define __u16 u_int16_t ++#define __s16 int16_t ++#define __u8 u_int8_t ++#define __s8 int8_t ++#endif + + /* + * Obsolete, deprecated names. Will be removed in libibverbs 1.1.
