Re: git: ac62b97951c2 - main - openssh: Add ${SKSRCS} to libssh

On Fri, May 23, 2025 at 12:06 PM John Baldwin <jhb@freebsd.org> wrote:
>
> On 5/20/25 18:59, Jose Luis Duran wrote:
> > The branch main has been updated by jlduran:
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=ac62b97951c25a33ec0880e574ccff31be7452f7
> >
> > commit ac62b97951c25a33ec0880e574ccff31be7452f7
> > Author:     Jose Luis Duran <jlduran@FreeBSD.org>
> > AuthorDate: 2025-05-20 22:58:23 +0000
> > Commit:     Jose Luis Duran <jlduran@FreeBSD.org>
> > CommitDate: 2025-05-20 22:58:23 +0000
> >
> >      openssh: Add ${SKSRCS} to libssh
> >
> >      sshkey.c references sshsk_sign(), which is defined in ${SKSRCS}.
> >
> >      Due to how FreeBSD builds libssh, or put differently, due to upstream
> >      not building a shared libssh.so, we need to partially revert
> >      65d8491719bb ("secure: Adapt Makefile to ssh-sk-client everywhere"), and
> >      add ${SKSRCS} back, to avoid linking problems, especially when building
> >      with GCC:
> >
> >          /usr/local/bin/ld:
> >          /usr/obj/usr/src/amd64.amd64/secure/lib/libssh/libprivatessh.so:
> >          undefined reference to `sshsk_sign'
> >          collect2: error: ld returned 1 exit status`
> >
> >      Put the sources in a separate line, to maintain line-by-line
> >      compatibility with upstream Makefile.in
> >
> >      PR:             286580
> >      Reviewed by:    emaste
> >      Approved by:    emaste (mentor)
> >      Fixes:  65d8491719bb ("secure: Adapt Makefile to ssh-sk-client everywhere")
> >      Differential Revision:  https://reviews.freebsd.org/D50020
>
> Shouldn't we revert all the other Makefile changes that added SKSRCS in the
> consumers of libssh?

I would be inclined to just revert a098111a28ed, and leave the others
"as is", just to "match" the SRCS line, which was the underlying
original motivation.

> --
> John Baldwin
>


-- 
Jose Luis Duran