sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

buildsystem: add missing defines for CLOCK_TAI, SO_TXTIME and SCM_TXTIME 

The commit c6f2cf7c2f ("cangen: add support for SO_TXTIME") relies
on several toolchain features ("CLOCK_TAI", "SO_TXTIME", "SCM_TXTIME")
which are not present in old toolchain.

Add defines to fix compilation on older toolchains.

Reported-by: https://github.com/b-thomson
Link: https://github.com/linux-can/can-utils/issues/398
Fixes: c6f2cf7c2f ("cangen: add support for SO_TXTIME")
pull/399/head
Marc Kleine-Budde 2023-01-24 09:49:25 +01:00
parent 77ec9b3c2d
commit e898c8a854
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -18,6 +18,9 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPF_CAN=29")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DAF_CAN=PF_CAN") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DAF_CAN=PF_CAN")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DN_SLCAN=17") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DN_SLCAN=17")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSCM_TIMESTAMPING_OPT_STATS=54") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSCM_TIMESTAMPING_OPT_STATS=54")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCLOCK_TAI=11")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSO_TXTIME=61")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSCM_TXTIME=SO_TXTIME")
include_directories (.) include_directories (.)
include_directories (./include) include_directories (./include)

12
configure.ac
View File

@ -99,6 +99,18 @@ AC_CHECK_DECL(SCM_TIMESTAMPING_OPT_STATS,,
[AC_DEFINE([SCM_TIMESTAMPING_OPT_STATS], [54], [SCM_TIMESTAMPING_OPT_STATS])], [AC_DEFINE([SCM_TIMESTAMPING_OPT_STATS], [54], [SCM_TIMESTAMPING_OPT_STATS])],
[[#include <linux/net.h>]] [[#include <linux/net.h>]]
) )
AC_CHECK_DECL(CLOCK_TAI,,
[AC_DEFINE([CLOCK_TAI], [11], [CLOCK_TAI])],
[[#include <time.h>]]
)
AC_CHECK_DECL(SO_TXTIME,,
[AC_DEFINE([SO_TXTIME], [61], [SO_TXTIME])],
[[#include <sys/socket.h>]]
)
AC_CHECK_DECL(SCM_TXTIME,,
[AC_DEFINE([SCM_TXTIME], [SO_TXTIME], [SCM_TXTIME])],
[[#include <sys/socket.h>]]
)
# #