Approved for commit and skipping maintainer

In D13797#289001, @imp wrote:

PTI means what?
Also, looks like this is unconditionally enabled unless the tunable is false. There's talk of doing things automatically based on CPU type and vendor elsewhere.

In D13712#287753, @bdrewery wrote:

In D13712#287435, @tobik wrote:

Adding a RUN_DEPENDS on kodi-devel@gbm to the x11 and wayland flavors is something that Poudriere doesn't seem to like (the ports framework
itself appears to not mind):

[00:00:02] Gathering ports metadata
[00:00:03] Warning: (multimedia/kodi-devel): Error: gather_port_vars_port: Already had multimedia/kodi-devel (rdep=metadata gbm listed)
[00:00:03] Error: Fatal errors encountered gathering ports metadata

Do you think this is a bug in Poudriere? Or am I misusing flavors?

The bug in Poudriere, IMHO, is that the error is obscure and needs to explicitly deny a port depending on itself: https://github.com/freebsd/poudriere/issues/574

In D13712#287435, @tobik wrote:

Adding a RUN_DEPENDS on kodi-devel@gbm to the x11 and wayland flavors is something that Poudriere doesn't seem to like (the ports framework
itself appears to not mind):

[00:00:02] Gathering ports metadata
[00:00:03] Warning: (multimedia/kodi-devel): Error: gather_port_vars_port: Already had multimedia/kodi-devel (rdep=metadata gbm listed)
[00:00:03] Error: Fatal errors encountered gathering ports metadata

Do you think this is a bug in Poudriere? Or am I misusing flavors?

Block pending potential Poudriere bug.

In D13712#287435, @tobik wrote:

In D13712#287420, @mat wrote:

Also, can the multiple flavors be installed at once?

Yes, they can all be installed at the same time. kodi-devel@gbm (which installs all necessary data files) has to be installed for the x11 and wayland flavors to even work.

Adding a RUN_DEPENDS on kodi-devel@gbm to the x11 and wayland flavors is something that Poudriere doesn't seem to like (the ports framework
itself appears to not mind):

[00:00:02] Gathering ports metadata
[00:00:03] Warning: (multimedia/kodi-devel): Error: gather_port_vars_port: Already had multimedia/kodi-devel (rdep=metadata gbm listed)
[00:00:03] Error: Fatal errors encountered gathering ports metadata

Do you think this is a bug in Poudriere? Or am I misusing flavors?

In D12464#277359, @mat wrote:

• Remove the extra flavors mess and add a USE_PYTHON=allflavors.

DESCRIBE_FLAVORED is still weird but otherwise ship it.

In D12483#277278, @mat wrote:

In D12483#277192, @bdrewery wrote:

In D12483#277184, @bdrewery wrote:

In D12483#262180, @mat wrote:

I am not against adding a FLAVOR_ prefix, but I think it will make very long variable names, say, FLAVOR_python3_OPTIONS_EXCLUDE= BAR. I think, as options are all UPPERCASE, we simply need to say that flavors are all lowercase, and thus, they cannot conflict.

I'm already confused.

But I do see there is logic to restrict flavors to lowercase so it is probably fine to keep how you have it.

I think it is better to have different namespaces for flavors and OPTIONS, so that they cannot possibly be confused with one another.

In D12483#277184, @bdrewery wrote:

In D12483#262180, @mat wrote:

I am not against adding a FLAVOR_ prefix, but I think it will make very long variable names, say, FLAVOR_python3_OPTIONS_EXCLUDE= BAR. I think, as options are all UPPERCASE, we simply need to say that flavors are all lowercase, and thus, they cannot conflict.

I'm already confused.

In D12483#262180, @mat wrote:

I am not against adding a FLAVOR_ prefix, but I think it will make very long variable names, say, FLAVOR_python3_OPTIONS_EXCLUDE= BAR. I think, as options are all UPPERCASE, we simply need to say that flavors are all lowercase, and thus, they cannot conflict.

Next task may be removing -DLINT support in source files like:

usr.sbin/cron/cron/cron.c:#if !defined(lint) && !defined(LINT)
usr.sbin/cron/cron/cron.h:# if !defined(LINT) && !defined(lint)
usr.sbin/cron/cron/database.c:#if !defined(lint) && !defined(LINT)

This has a minor conflict with your D13124 change.

These are still here too:

share/mk/bsd.subdir.mk:         installfiles installincludes print-dir realinstall lint \
share/mk/bsd.sys.mk:            installincludes lint obj objlink objs objwarn \

In D13092#272310, @sjg wrote:

:@ rocks

I think removing MAKEFLAGS may be too much. I think we can just add MAKESYSPATH=/usr/share/mk to the environment and should also set _WITHOUT_SRCCONF=yes.