upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-21 14:17:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

We do not need readpassphrase from openssh

Browse source 
When building tar for linux, just disable HAVE_READPASSPHRASE
in config_freebsd.h and libarchive will provide for readpassphrase
Otherwise the two conflict.
This commit is contained in:
Simon J. Gerraty 2023-04-24 13:50:18 -07:00
parent b6d173e44b
commit 644d346d99
3 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/libarchive/config_freebsd.h
View file

@ -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

11
tools/build/Makefile
View file

@ -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"

4
tools/build/cross-build/include/linux/includes.h
View file

@ -1,4 +0,0 @@
#include <sys/cdefs.h>
#include <paths.h>
#define DEF_WEAK(a)