From 824c054bbce9114a119d6c330675eb4ad836eccc Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 29 Dec 2009 13:31:56 +0000 Subject: [PATCH] Experimentally enabled FreeBSD system adapter for Debian kfreebsd --- libburn/trunk/acinclude.m4 | 4 ++++ libburn/trunk/cdrskin/cdrskin_timestamp.h | 2 +- libburn/trunk/libburn/os.h | 9 +++++++++ libburn/trunk/libburn/sg.c | 6 ++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/libburn/trunk/acinclude.m4 b/libburn/trunk/acinclude.m4 index cad28241..42035805 100644 --- a/libburn/trunk/acinclude.m4 +++ b/libburn/trunk/acinclude.m4 @@ -16,6 +16,10 @@ AC_DEFUN([TARGET_SHIZZLE], LIBBURN_ARCH_LIBS=-lcam LIBBURNIA_PKGCONFDIR=$(echo "$libdir" | sed 's/\/lib$/\/libdata/')/pkgconfig ;; + kfreebsd*-gnu) + ARCH=freebsd + LIBBURN_ARCH_LIBS=-lcam + ;; *) ARCH= LIBBURN_ARCH_LIBS= diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h index 2393b0b8..e7419242 100644 --- a/libburn/trunk/cdrskin/cdrskin_timestamp.h +++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2009.12.29.115854" +#define Cdrskin_timestamP "2009.12.29.132537" diff --git a/libburn/trunk/libburn/os.h b/libburn/trunk/libburn/os.h index f283a4c3..441ce80c 100644 --- a/libburn/trunk/libburn/os.h +++ b/libburn/trunk/libburn/os.h @@ -29,6 +29,14 @@ #include "os-freebsd.h" +#else +#ifdef __FreeBSD_kernel__ + + +/* ----------------------- FreeBSD with CAM under Debian ------------------- */ +#include "os-freebsd.h" + + #else #ifdef __linux @@ -45,6 +53,7 @@ #endif /* ! __linux */ +#endif /* ! __FreeBSD__kernel__ */ #endif /* ! __FreeBSD__ */ #endif /* ! Libburn_use_libcdiO */ diff --git a/libburn/trunk/libburn/sg.c b/libburn/trunk/libburn/sg.c index 5dac767b..258856aa 100644 --- a/libburn/trunk/libburn/sg.c +++ b/libburn/trunk/libburn/sg.c @@ -14,6 +14,11 @@ #include "sg-freebsd.c" +#else +#ifdef __FreeBSD_kernel__ + +#include "sg-freebsd.c" + #else #ifdef __linux @@ -42,6 +47,7 @@ static int intentional_compiler_warning(void) #include "sg-dummy.c" #endif /* ! __linux */ +#endif /* ! __FreeBSD_kernel__ */ #endif /* ! __FreeBSD__ */ #endif /* ! Libburn_use_libcdiO */