Skip to content

Commit 91cc2c1

Browse files
committed
ports/freebsd: fix make check on recent Linux/glibc
Add an (empty) sys/param.h since it's used by topology-freebsd.c Otherwise, the ports/freebsd cross-build fails on recent Linuc/glibc because it tries to use our emulated sys/user.h which isn't enough to understand Linux' sys/param.h. With a dummy sys/param.h, the problems goes away. Our FreeBSD code doesn't seem to currently need sys/param.h but I can't be sure it's true for all FreeBSD releases, so let's keep it. Thanks to Ludovic Courtes for the help. Signed-off-by: Brice Goglin <[email protected]>
1 parent 7f351ce commit 91cc2c1

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

tests/hwloc/ports/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright © 2009-2019 Inria. All rights reserved.
1+
# Copyright © 2009-2020 Inria. All rights reserved.
22
# Copyright © 2009, 2011-2012 Université Bordeaux
33
# Copyright © 2009-2014 Cisco Systems, Inc. All rights reserved.
44
# See COPYING in top-level directory.
@@ -76,6 +76,7 @@ libhwloc_port_freebsd_la_SOURCES = \
7676
include/freebsd/sys/sysctl.h \
7777
include/freebsd/sys/thr.h \
7878
include/freebsd/sys/user.h \
79+
include/freebsd/sys/param.h \
7980
include/freebsd/sys/domainset.h
8081
libhwloc_port_freebsd_la_CPPFLAGS = $(common_CPPFLAGS) \
8182
-I$(HWLOC_top_srcdir)/tests/hwloc/ports/include/freebsd \
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#ifndef _SYS_PARAM_H_
2+
#define _SYS_PARAM_H_
3+
4+
#endif /* _SYS_PARAM_H_ */

0 commit comments

Comments
 (0)