Package: bladerf / 0.2017.12~rc1-2

debian-kfreebsd Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
Description: Handle Debian kFreeBSD architecture.
Author: A. Maitland Bottoms <bottoms@debian.org>

--- a/host/libraries/libbladeRF/src/backend/usb/libusb.c
+++ b/host/libraries/libbladeRF/src/backend/usb/libusb.c
@@ -22,6 +22,11 @@
 #include <pthread.h>
 #include <errno.h>
 #include <libusb.h>
+
+#if defined(__FreeBSD_kernel__)
+#define LIBUSB_CALL
+#endif
+
 #include "bladeRF.h"    /* Firmware interface */
 
 #include "backend/backend.h"
--- a/host/cmake/modules/FindLibUSB.cmake
+++ b/host/cmake/modules/FindLibUSB.cmake
@@ -48,18 +48,15 @@
 endif()
 
 # FreeBSD has built-in libusb since 800069
-if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+if((${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") OR (${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD") )
   exec_program(sysctl ARGS -n kern.osreldate OUTPUT_VARIABLE FREEBSD_VERSION)
-  set(MIN_FREEBSD_VERSION 800068)
-  if(FREEBSD_VERSION GREATER ${MIN_FREEBSD_VERSION})
-    set(LIBUSB_FOUND TRUE)
-    set(LIBUSB_SKIP_VERSION_CHECK TRUE)
-    set(LIBUSB_INCLUDE_DIRS "/usr/include")
-    set(LIBUSB_HEADER_FILE "${LIBUSB_INCLUDE_DIRS}/libusb.h")
-    set(LIBUSB_LIBRARIES "usb")
-    set(LIBUSB_LIBRARY_DIRS "/usr/lib/")
-  endif(FREEBSD_VERSION GREATER ${MIN_FREEBSD_VERSION})
-endif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+  set(LIBUSB_FOUND TRUE)
+  set(LIBUSB_SKIP_VERSION_CHECK TRUE)
+  set(LIBUSB_INCLUDE_DIRS "/usr/include")
+  set(LIBUSB_HEADER_FILE "${LIBUSB_INCLUDE_DIRS}/libusb.h")
+  set(LIBUSB_LIBRARIES "usb")
+  set(LIBUSB_LIBRARY_DIRS "/usr/lib/")
+endif((${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") OR (${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD") )
 
 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
--- a/host/libraries/libbladeRF/CMakeLists.txt
+++ b/host/libraries/libbladeRF/CMakeLists.txt
@@ -425,17 +425,18 @@
     @ONLY
 )
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+if((${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") AND NOT (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD"))
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/libbladeRF.pc
     DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig
 )
 else()
+# Debian kFreeBSD uses the same location as Debian Linux
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/libbladeRF.pc
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/
 )
-endif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+endif((${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") AND NOT (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD"))
 
 ################################################################################
 # Library installation information