Date: Fri, 23 May 2025 10:06:01 -0700
From: John Baldwin <jhb@FreeBSD.org>
To: Jose Luis Duran <jlduran@FreeBSD.org>, 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: <4e0ac4ad-58cf-4ba2-828f-53d5e8179b08@FreeBSD.org>
In-Reply-To: <202505202259.54KMxhl1053598@gitrepo.freebsd.org>
References: <202505202259.54KMxhl1053598@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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? -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4e0ac4ad-58cf-4ba2-828f-53d5e8179b08>