diff options
| author | Ilya Maximets <i.maximets@ovn.org> | 2020-08-12 10:57:07 +0200 |
|---|---|---|
| committer | Ilya Maximets <i.maximets@ovn.org> | 2020-08-12 18:31:33 +0200 |
| commit | 21b32b2aa4a7a49192415b8a33b65008dafd9983 (patch) | |
| tree | 29a5003bfc1093f74ac1267b4492ab2b7afe6613 | |
| parent | 079f33abc696b6cab0bfdd002c996cd75248a56b (diff) | |
| download | openvswitch-21b32b2aa4a7a49192415b8a33b65008dafd9983.tar.gz | |
acinclude: Fix build with kernels with prandom* moved to prandom.h.
Recent commit c0842fbc1b18 ("random32: move the pseudo-random 32-bit
definitions to prandom.h") in upstream kernel moved the definition
of prandom_* functions from random.h to prandom.h. This change was
also backported to stable kernels.
Fixing our configure script to look for these functions in a new
location and avoid build failures:
datapath/linux/compat/include/linux/random.h:11:19:
error: redefinition of 'prandom_u32_max'
Acked-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
| -rw-r--r-- | acinclude.m4 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 7c67fe325..822b83717 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -636,6 +636,10 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/linux/random.h], [prandom_u32]) OVS_GREP_IFELSE([$KSRC/include/linux/random.h], [prandom_u32_max]) + OVS_GREP_IFELSE([$KSRC/include/linux/prandom.h], + [prandom_u32[[\(]]], + [OVS_DEFINE([HAVE_PRANDOM_U32])]) + OVS_GREP_IFELSE([$KSRC/include/linux/prandom.h], [prandom_u32_max]) OVS_GREP_IFELSE([$KSRC/include/net/rtnetlink.h], [get_link_net]) OVS_GREP_IFELSE([$KSRC/include/net/rtnetlink.h], [name_assign_type]) |