From 7beb9137d55152ec868d019c836052e6d11529bf Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 21 Feb 2018 10:41:24 +0100 Subject: [PATCH 209/325] Only build mlx4 if MK_OFED is set to yes. Squash cc -target x86_64-unknown-freebsd11.1 --sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin -O2 -pipe -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc -I/usr/src/sys/ofed/include -I/usr/src/sys/compat/ linuxkpi/common/include -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/ELECTRO_BLOAT/opt_global.h -I. -I/usr/src/sys -fno-common -g -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/obj/usr/src/sys/ELEC TRO_BLOAT -MD -MF.depend.mlx4_catas.o -MTmlx4_catas.o -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float -fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector -gdwarf-2 -Wall -Wredundant-decl s -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -D__printf__=__freebsd_kprintf__ -Wmissing-include-dirs -fdiagnostics-show-option -Wno-unknown-pragma s -Wno-error-tautological-compare -Wno-error-empty-body -Wno-error-parentheses-equality -Wno-error-unused-function -Wno-error-pointer-sign -Wno-error-shift-negative-value -Wno-error-address-of-packed-member -mno-aes -mno-av x -std=iso9899:1999 -Wno-cast-qual -Wno-pointer-arith -c /usr/src/sys/dev/mlx4/mlx4_core/mlx4_catas.c -o mlx4_catas.o ctfconvert -L VERSION -g mlx4_catas.o cc -target x86_64-unknown-freebsd11.1 --sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin -O2 -pipe -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc -I/usr/src/sys/ofed/include -I/usr/src/sys/compat/ linuxkpi/common/include -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/ELECTRO_BLOAT/opt_global.h -I. -I/usr/src/sys -fno-common -g -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/usr/obj/usr/src/sys/ELEC TRO_BLOAT -MD -MF.depend.mlx4_cmd.o -MTmlx4_cmd.o -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float -fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector -gdwarf-2 -Wall -Wredundant-decls -$ nested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -D__printf__=__freebsd_kprintf__ -Wmissing-include-dirs -fdiagnostics-show-option -Wno-unknown-pragmas -$ no-error-tautological-compare -Wno-error-empty-body -Wno-error-parentheses-equality -Wno-error-unused-function -Wno-error-pointer-sign -Wno-error-shift-negative-value -Wno-error-address-of-packed-member -mno-aes -mno-avx $ std=iso9899:1999 -Wno-cast-qual -Wno-pointer-arith -c /usr/src/sys/dev/mlx4/mlx4_core/mlx4_cmd.c -o mlx4_cmd.o /usr/src/sys/dev/mlx4/mlx4_core/mlx4_cmd.c:45:10: fatal error: 'rdma/ib_smi.h' file not found #include ^~~~~~~~~~~~~~~ 1 error generated. *** Error code 1 Stop. make[4]: stopped in /usr/src/sys/modules/mlx4 *** Error code 1 Stop. make[3]: stopped in /usr/src/sys/modules *** Error code 1 Stop. make[2]: stopped in /usr/obj/usr/src/sys/ELECTRO_BLOAT *** Error code 1 Stop. make[1]: stopped in /usr/src *** Error code 1 Stop. make: stopped in /usr/src Obtained from: ElectroBSD --- sys/modules/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 289eea8291fc..23b7ea0ef555 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -518,9 +518,7 @@ _ena= ena _ibcore= ibcore _ipoib= ipoib _iser= iser -.endif _mlx4= mlx4 -.if ${MK_OFED} != "no" || defined(ALL_MODULES) _mlx5= mlx5 .if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \ defined(ALL_MODULES) -- 2.32.0