Re: git: 06601897e5cd - main - framework: reintroduce the feature enabling code

On 2024-04-12T09:54:47.000+02:00, Mathieu Arnold <mat@FreeBSD.org>
wrote:

> The branch main has been updated by mat:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=06601897e5cd4afcc31f3b508b2cbb2bc7d4a677
> 
> commit 06601897e5cd4afcc31f3b508b2cbb2bc7d4a677
> 
> Author:     Mathieu Arnold <mat@FreeBSD.org>
> 
> AuthorDate: 2024-04-12 07:49:01 +0000
> 
> Commit:     Mathieu Arnold <mat@FreeBSD.org>
> 
> CommitDate: 2024-04-12 07:53:27 +0000
> 
>     framework: reintroduce the feature enabling code
> 
>     
> 
>     For each feature (see in Mk/Features) users can now set these variables
> 
>     in their make.conf. Using LTO as an example.
> 
>     
> 
>     To enable globally:
> 
>     
> 
>       WITH_LTO= yes
> 
>     
> 
>     To disable globally (for example ssp is enabled by default):
> 
>     
> 
>       WITHOUT_LTO=  yes
> 
>     
> 
>     To enable for a specific list of ports:
> 
>     
> 
>       WITH_LTO_PORTS= lang/perl5.36
> 
>     
> 
>     To disable for a specific list of ports:
> 
>     
> 
>       WITHOUT_LTO_PORTS= lang/perl5.36
> 
>     
> 
>     Differential Revision:  https://reviews.freebsd.org/D44750
> 
> ---
> 
>  Mk/Uses/cargo.mk [http://cargo.mk]           |  4 +---
> 
>  Mk/bsd.port.mk [http://bsd.port.mk]             | 42 ++++++++++++++++++++++++++++++++++--------
> 
>  net-mgmt/net-snmp/Makefile |  2 +-
> 
>  3 files changed, 36 insertions(+), 12 deletions(-)
> 
> diff --git a/Mk/Uses/cargo.mk [http://cargo.mk] b/Mk/Uses/cargo.mk [http://cargo.mk]
> 
> index e3b733d35821..8710374e3584 100644
> 
> --- a/Mk/Uses/cargo.mk [http://cargo.mk]
> 
> +++ b/Mk/Uses/cargo.mk [http://cargo.mk]
> 
> @@ -139,10 +139,8 @@ CARGO_ENV+= \
> 
>  CARGO_ENV+=    RUST_BACKTRACE=1
> 
>  .  endif
> 
>  
> 
> -.  if !defined(_WITHOUT_LTO) && (!defined(WITHOUT_LTO_PORTS) || ${WITHOUT_LTO_PORTS:N${PKGORIGIN}})
> 
> +.  if defined(WITH_LTO)
> 
>  _CARGO_MSG=    "===>   Additional optimization to port applied"
> 
> -_WITH_LTO=    yes
> 
> -.undef _WITHOUT_LTO
> 
>  .  endif 

Hi,

This changes so LTO option is no longer applied to Rust (cargo) ports
BY DEFAULT causing a regresssion, please fix.

Best regards,

Daniel