debian/patches/06_kfreebsd_sys_pipe.patch: Don't include sys/pipe.h on
kFreeBSD. Defining _KERNEL to include sys/pipe.h subsequently breaks sys/conf.h; since sys/pipe.h is not meant to be used in userland, and libgtop2 builds anyway on kFreeBSD without it, don't include it. Thanks to Steven Chamberlain for the patch. Closes: #667984
This commit is contained in:
22
debian/patches/06_kfreebsd_sys_pipe.patch
vendored
Normal file
22
debian/patches/06_kfreebsd_sys_pipe.patch
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
Description: Don't include sys/pipe.h on kFreeBSD
|
||||
Defining _KERNEL to include sys/pipe.h subsequently breaks sys/conf.h;
|
||||
since sys/pipe.h is not meant to be used in userland, and libgtop2 builds
|
||||
anyway on kFreeBSD without it, don't include it.
|
||||
Author: Steven Chamberlain <steven@pyro.eu.org>
|
||||
Bug-Debian: http://bugs.debian.org/667984
|
||||
|
||||
Index: libgtop2-2.28.4/sysdeps/freebsd/procmap.c
|
||||
===================================================================
|
||||
--- libgtop2-2.28.4.orig/sysdeps/freebsd/procmap.c 2012-04-07 22:49:20.000000000 +0100
|
||||
+++ libgtop2-2.28.4/sysdeps/freebsd/procmap.c 2012-04-07 22:51:00.163079809 +0100
|
||||
@@ -38,10 +38,7 @@
|
||||
#include <sys/vnode.h>
|
||||
#undef _KVM_VNODE
|
||||
|
||||
-#define _KERNEL
|
||||
-#include <sys/pipe.h>
|
||||
#include <sys/conf.h>
|
||||
-#undef _KERNEL
|
||||
#if (__FreeBSD_version >= 800038) || (__FreeBSD_kernel_version >= 800038)
|
||||
#define _WANT_FILE
|
||||
#include <sys/file.h>
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@@ -3,4 +3,5 @@
|
||||
03_kfreebsd_installdirs.patch
|
||||
04_kfreebsd_version_check.patch
|
||||
05_kfreebsd_8.0.patch
|
||||
06_kfreebsd_sys_pipe.patch
|
||||
99_ltmain_as-needed.patch
|
||||
|
Reference in New Issue
Block a user