Date: Thu, 2 Feb 2023 17:23:51 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 0f031350f32b - main - rescue: Fix link order of SSL libraries and fetch. Message-ID: <202302021723.312HNpJi007038@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0f031350f32b8760e0843a6476d67aa21116103b commit 0f031350f32b8760e0843a6476d67aa21116103b Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2023-02-02 17:23:02 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2023-02-02 17:23:02 +0000 rescue: Fix link order of SSL libraries and fetch. ld.bfd requires libraries to be linked in order. libssl requires libcrypto. libfetch requires libssl. To fix the latter, move fetch up above tar rather than listing the ssl libraries twice. Reviewed by: delphij Fixes: ea34aa4780e5 rescue: Add fetch(1) to the rescue tool. Differential Revision: https://reviews.freebsd.org/D38304 --- rescue/rescue/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 6093cf6609d1..2360bf83b781 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -212,16 +212,16 @@ CRUNCH_PROGS_usr.bin+= zstd CRUNCH_ALIAS_zstd= unzstd zstdcat zstdmt CRUNCH_LIBS+= ${LDADD_zstd} +CRUNCH_PROGS_usr.bin+= fetch +CRUNCH_LIBS+= -lfetch + CRUNCH_PROGS_usr.bin+= tar CRUNCH_LIBS+= -larchive .if ${MK_OPENSSL} != "no" -CRUNCH_LIBS+= -lcrypto -lssl +CRUNCH_LIBS+= -lssl -lcrypto .endif CRUNCH_LIBS+= -lmd -CRUNCH_PROGS_usr.bin+= fetch -CRUNCH_LIBS+= -lfetch - .if ${MK_NETCAT} != "no" CRUNCH_PROGS_usr.bin+= nc .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302021723.312HNpJi007038>