Date: Mon, 24 Apr 2023 20:50:56 GMT From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 644d346d998e - main - We do not need readpassphrase from openssh Message-ID: <202304242050.33OKouDP087486@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=644d346d998e2785bfa35ec0ddd4cea2885e2da7 commit 644d346d998e2785bfa35ec0ddd4cea2885e2da7 Author: Simon J. Gerraty <sjg@FreeBSD.org> AuthorDate: 2023-04-24 20:50:18 +0000 Commit: Simon J. Gerraty <sjg@FreeBSD.org> CommitDate: 2023-04-24 20:50:18 +0000 We do not need readpassphrase from openssh When building tar for linux, just disable HAVE_READPASSPHRASE in config_freebsd.h and libarchive will provide for readpassphrase Otherwise the two conflict. --- lib/libarchive/config_freebsd.h | 2 ++ tools/build/Makefile | 11 ----------- tools/build/cross-build/include/linux/includes.h | 4 ---- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h index dabc84d17ee6..2d891bc9bd5e 100644 --- a/lib/libarchive/config_freebsd.h +++ b/lib/libarchive/config_freebsd.h @@ -166,8 +166,10 @@ #define HAVE_READDIR_R 1 #define HAVE_READLINK 1 #define HAVE_READLINKAT 1 +#ifndef __linux__ #define HAVE_READPASSPHRASE 1 #define HAVE_READPASSPHRASE_H 1 +#endif #define HAVE_REGEX_H 1 #define HAVE_SELECT 1 #define HAVE_SETENV 1 diff --git a/tools/build/Makefile b/tools/build/Makefile index 1dc6e9fc189b..eb5bd44db6a1 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -209,17 +209,6 @@ SRCS+= progname.c # Stub implementations of fflagstostr/strtofflags SRCS+= fflags.c -# tar needs readpassphrase -# the version from openssh is already "portable" -# but we need to take care with .PATH as we -# do not want getopt_long.c from crypto/openssh/openbsd-compat -# and we do not want readpassphrase.c from libc/gen -.PATH: ${SRCTOP}/crypto/openssh -OBJS_SRCS_FILTER= T R -SRCS+= openbsd-compat/readpassphrase.c - -INCS+= ${SRCTOP}/crypto/openssh/openbsd-compat/readpassphrase.h - .endif # ${MAKE.OS} == "Linux" .if ${.MAKE.OS} == "Darwin" diff --git a/tools/build/cross-build/include/linux/includes.h b/tools/build/cross-build/include/linux/includes.h deleted file mode 100644 index ed9ea212ee10..000000000000 --- a/tools/build/cross-build/include/linux/includes.h +++ /dev/null @@ -1,4 +0,0 @@ -#include <sys/cdefs.h> -#include <paths.h> - -#define DEF_WEAK(a)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304242050.33OKouDP087486>