From e898c8a854cf221ac8f0034df7dadf8b983c4366 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Tue, 24 Jan 2023 09:49:25 +0100 Subject: [PATCH] buildsystem: add missing defines for CLOCK_TAI, SO_TXTIME and SCM_TXTIME The commit c6f2cf7c2f27 ("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: c6f2cf7c2f27 ("cangen: add support for SO_TXTIME") --- CMakeLists.txt | 3 +++ configure.ac | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4e8484..09ccd80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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} -DN_SLCAN=17") 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) diff --git a/configure.ac b/configure.ac index c91d844..5493c9c 100644 --- a/configure.ac +++ b/configure.ac @@ -99,6 +99,18 @@ AC_CHECK_DECL(SCM_TIMESTAMPING_OPT_STATS,, [AC_DEFINE([SCM_TIMESTAMPING_OPT_STATS], [54], [SCM_TIMESTAMPING_OPT_STATS])], [[#include ]] ) +AC_CHECK_DECL(CLOCK_TAI,, + [AC_DEFINE([CLOCK_TAI], [11], [CLOCK_TAI])], + [[#include ]] +) +AC_CHECK_DECL(SO_TXTIME,, + [AC_DEFINE([SO_TXTIME], [61], [SO_TXTIME])], + [[#include ]] +) +AC_CHECK_DECL(SCM_TXTIME,, + [AC_DEFINE([SCM_TXTIME], [SO_TXTIME], [SCM_TXTIME])], + [[#include ]] +) #