svn commit: r365281 - in stable: 11/sys/conf 11/sys/modules 11/sys/modules/tcp 12/sys/conf 12/sys/modules 12/sys/modules/tcp

[John Baldwin]

On 9/3/20 11:39 AM, Eugene Grosbein wrote:
> 04.09.2020 1:16, Eugene Grosbein wrote:
> 
>>> This should fix the build breakage from r365270 (sorry).
>>
>> buildworld is still broken for me at stable/11 amd64 r365304.
>> Specifically, I build stable/11 for my PPPoE servers that use no IPSec as module nor have it in the kernel in any way.
>>
>> /etc/make.conf contains:
>>
>> MODULES_WITH_WORLD=
>> KERNCONF?=              PPPOE
>> WITHOUT_LLVM_TARGET_ALL=
>> WITH_LLVM_TARGET_X86=
>> WITHOUT_CLANG_FULL=
>> WITHOUT_LLDB=
>> WITHOUT_KERNEL_SYMBOLS=
>> WITHOUT_DEBUG_FILES=
>> WITHOUT_TESTS=
>> WITHOUT_INET6=
>>
>> It fails early:
>>
>> ...
>> --------------------------------------------------------------
>>>>> stage 2.2: rebuilding the object tree
>> --------------------------------------------------------------
>> ...
>> ===> sys/modules/sysvipc/sysvmsg (obj)
>> --- obj_subdir_sys/modules/tcp ---
>> make[6]: "/home/src/sys/modules/tcp/Makefile" line 18: Malformed conditional (${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC})
>> make[6]: Fatal errors encountered -- cannot continue
>>
>>
>> Rollback for both of r365270 and r365281 fixes this.
> 
> Oops, I was too quick. Rollback of these allows it running OK until >>> stage 4.3: building everything
> but then it fails there:
> 
> ===> sys/modules/if_enc (all)
> Building /usr/local/obj/home/src/sys/modules/if_enc/if_enc.o
> --- if_enc.o ---
> /home/src/sys/net/if_enc.c:33:10: fatal error: 'opt_ipsec.h' file not found
> #include "opt_ipsec.h"
>          ^~~~~~~~~~~~~
> 
> Additional rollback of r365277 gave me successfull buildworld.

Ah, it is MODULES_WITH_WORLD that is tripping you up.  What is probably
needed to fix this is merging kmod.opts.mk.  I can work on that.

-- 
John Baldwin