From: Stuart Henderson <stu@spacehopper.org>
Subject: Re: dpb always rebuild rust-bootstrap
To: Solene Rapenne <solene@perso.pw>
Cc: Sebastien Marie <semarie@kapouay.eu.org>, ports@openbsd.org
Date: Sun, 21 Apr 2024 11:56:30 +0100

On 2024/04/21 11:35, Solene Rapenne wrote:
> On Sat, Apr 20, 2024 at 10:02:38AM GMT, Solene Rapenne wrote:
> > On Sat, Apr 20, 2024 at 09:00:30AM GMT, Sebastien Marie wrote:
> > > Solene Rapenne <solene@perso.pw> writes:
> > > 
> > > > hi, on a fresh current amd64 I had to set up dpb because it seems
> > > > there was a libc bump at the wrong time for me :)
> > > >
> > > > however, now I have my working dpb (easy to setup once you understand
> > > > it), I don't understand why dpb -R something_depending_on_rust
> > > > always have to recompile lang/rust, in the packages directory, only
> > > > the rust bootstrap package is changed everytime I run dpb.
> > > >
> > > > I'm not sure which logs I could provide though. This is quite
> > > > annoying because lang/rust is heavy to compile and I like to trigger
> > > > dpb every time I try a diff.
> > > >
> > > > Am I the only one with this issue?
> > > 
> > > I'm interested to know if there are any problems with the way I did
> > > rust-bootstrap.
> > > 
> > > Currently, it is marked with 'always-update', because the package
> > > content depend on the build host (system libraries are embedded in the
> > > package for the bootstrap purpose). I expected that if the package isn't
> > > installed (and it shouldn't in standard usage) it will not be a problem.
> > > 
> > > Do you have it installed ? If it isn't the case, and dpb is rebuilding
> > > it without purpose (I assume no port depending on it), it might be a
> > > problem in dpb, or some side effect for a subpackage having
> > > 'always-update'.
> > > 
> > > I could look to remove the 'always-update' option from rust-bootstrap
> > > without too much trouble.
> > > 
> > > Thanks.
> > > -- 
> > > Sebastien Marie
> > 
> > rust-bootstrap is not installed in the chroot after using dpb -R shells/nushell
> > that rebuilt rust-bootstrap , I don't think junking happened
> > 
> > I'll try without always-update
> > 
> 
> dpb stopped rebuilding rust everytime since I removed always-update
> 
> I don't know if REVISION could be set only for bootstrap, but
> following diff works for me

The plain REVISION bump like you've done is correct.

I would set WANTLIB-bootstrap to the list of libraries used in the
bootstrap. That way it will be automically updated when necessary.
(Ignore the "not needed" from check-lib-depends).

> diff --git a/lang/rust/Makefile b/lang/rust/Makefile
> index 035767f1126..ba65386765a 100644
> --- a/lang/rust/Makefile
> +++ b/lang/rust/Makefile
> @@ -17,6 +17,7 @@ COMMENT-src =		Rust source component
>  
>  V =			1.77.2
>  DISTNAME =		rustc-${V}-src
> +REVISION =		0
>  
>  # rustc bootstrap version
>  BV-aarch64 =		1.77.0-20240320
> diff --git a/lang/rust/pkg/PLIST-bootstrap b/lang/rust/pkg/PLIST-bootstrap
> index 17001b7230c..1b28ca27ca2 100644
> --- a/lang/rust/pkg/PLIST-bootstrap
> +++ b/lang/rust/pkg/PLIST-bootstrap
> @@ -1,2 +1 @@
> -@option always-update
>  lib/rustc-bootstrap-${MACHINE_ARCH}.tar
>