Re: git: 7e35117eb07f - main - Makefile: Hook MIT KRB5 into the build

On Fri, 20 Jun 2025 12:27:09 +0300
Dima Panov <fluffy@FreeBSD.org> wrote:

> Hello!
> 
> 
> Looks like something missing after the build with MIT Kerberos.
> 
> got this with devel/gvfs build:
> 
> ==
> In file included from ../daemon/pty_open.c:70:
> /usr/include/util.h:36:10: fatal error: 'k5-int.h' file not found
>     36 | #include "k5-int.h"
>        |          ^~~~~~~~~~
> 1 error generated.
> ==
> 
> Indeed, k5-int.h is missing in /usr/include :(
> 
> On 16.06.2025 05:51, Cy Schubert wrote:
> > The branch main has been updated by cy:
> > 
> > URL: https://cgit.FreeBSD.org/src/commit/?id=7e35117eb07f86c385656ecc6a2a92093be98131
> > 
> > commit 7e35117eb07f86c385656ecc6a2a92093be98131
> > Author:     Cy Schubert <cy@FreeBSD.org>
> > AuthorDate: 2025-06-11 02:57:54 +0000
> > Commit:     Cy Schubert <cy@FreeBSD.org>
> > CommitDate: 2025-06-16 02:49:37 +0000
> > 
> >      Makefile: Hook MIT KRB5 into the build
> >      
> >      Add tests for MK_MITKRB5. If "yes" build MIT KRB5. If "no" build Heimdal.
> >      The default is MK_MITKRB5 = no, added by "krb5: Add build plumbing".
> >      
> >      At some point we will change the default to MK_MITKRB5 = yes. A ports
> >      exp-run will need to be successfully run first.
> >      
> >      Sponsored by:           The FreeBSD Foundation
> >      Differential revision:  https://reviews.freebsd.org/D50815
> > ---
> >   Makefile.inc1        | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> >   Makefile.libcompat   |  4 +++
> >   tools/build/Makefile | 64 +++++++++++++++++++++++++++++++++++++
> >   3 files changed, 157 insertions(+)
> > 
[...]

The attached patch will fix the problem. It contains two parts.

1.  Don't install the offending header files. They were in my first cut
    of the plugins build and were not removed as I cleaned up while
    rationalizing the installed files with the port.

2.  OptionalObsoleteFiles.inc removes the files that were erroneously
    installed.

It is enough to run make delete-old to fix the problem. The Maefile
patch ensures they're not installed again.

My buildworld/installworld test is still running to verify nothing else
is broken.

Sorry for the breakage.

-- 
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  https://FreeBSD.org
NTP:           <cy@nwtime.org>    Web:  https://nwtime.org

			e**(i*pi)+1=0