Date: Fri, 23 May 2025 12:16:41 -0500
From: Jose Luis Duran <jlduran@freebsd.org>
To: John Baldwin <jhb@freebsd.org>
Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org
Subject: Re: git: ac62b97951c2 - main - openssh: Add ${SKSRCS} to libssh
Message-ID: <CAPwQLccP1-8YFKzjc7HDZsEAu8=qsGjTtbAyT0gmwmmcjzy78g@mail.gmail.com>
In-Reply-To: <4e0ac4ad-58cf-4ba2-828f-53d5e8179b08@FreeBSD.org>
References: <202505202259.54KMxhl1053598@gitrepo.freebsd.org> <4e0ac4ad-58cf-4ba2-828f-53d5e8179b08@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, May 23, 2025 at 12:06=E2=80=AFPM John Baldwin <jhb@freebsd.org> wro= te: > > 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=3Dac62b97951c25a33ec0880e5= 74ccff31be7452f7 > > > > 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 upstr= eam > > 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 bui= lding > > with GCC: > > > > /usr/local/bin/ld: > > /usr/obj/usr/src/amd64.amd64/secure/lib/libssh/libprivatessh.s= o: > > 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 eve= rywhere") > > Differential Revision: https://reviews.freebsd.org/D50020 > > Shouldn't we revert all the other Makefile changes that added SKSRCS in t= he > 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 > --=20 Jose Luis Duran
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPwQLccP1-8YFKzjc7HDZsEAu8=qsGjTtbAyT0gmwmmcjzy78g>