mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 21:05:08 +00:00
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.
This commit is contained in:
parent
b6d173e44b
commit
644d346d99
|
@ -166,8 +166,10 @@
|
||||||
#define HAVE_READDIR_R 1
|
#define HAVE_READDIR_R 1
|
||||||
#define HAVE_READLINK 1
|
#define HAVE_READLINK 1
|
||||||
#define HAVE_READLINKAT 1
|
#define HAVE_READLINKAT 1
|
||||||
|
#ifndef __linux__
|
||||||
#define HAVE_READPASSPHRASE 1
|
#define HAVE_READPASSPHRASE 1
|
||||||
#define HAVE_READPASSPHRASE_H 1
|
#define HAVE_READPASSPHRASE_H 1
|
||||||
|
#endif
|
||||||
#define HAVE_REGEX_H 1
|
#define HAVE_REGEX_H 1
|
||||||
#define HAVE_SELECT 1
|
#define HAVE_SELECT 1
|
||||||
#define HAVE_SETENV 1
|
#define HAVE_SETENV 1
|
||||||
|
|
|
@ -209,17 +209,6 @@ SRCS+= progname.c
|
||||||
# Stub implementations of fflagstostr/strtofflags
|
# Stub implementations of fflagstostr/strtofflags
|
||||||
SRCS+= fflags.c
|
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"
|
.endif # ${MAKE.OS} == "Linux"
|
||||||
|
|
||||||
.if ${.MAKE.OS} == "Darwin"
|
.if ${.MAKE.OS} == "Darwin"
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
#include <sys/cdefs.h>
|
|
||||||
#include <paths.h>
|
|
||||||
|
|
||||||
#define DEF_WEAK(a)
|
|
Loading…
Reference in a new issue