From 496374e59246349fe0c84af68c5490ba5b6bad33 Mon Sep 17 00:00:00 2001 From: Matthieu Guegan Date: Fri, 20 Nov 2020 10:50:39 +0100 Subject: [PATCH] BUILD: makefile: enable crypt(3) for OpenBSD Allow OpenBSD to support encrypted passwords in Userlists. OpenBSD's crypt(3) function is provided directly by libc and does not require -lcrypt. Signed-off-by: Matthieu Guegan --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ed0cdd51d6..b93b0a8723 100644 --- a/Makefile +++ b/Makefile @@ -390,8 +390,8 @@ endif # OpenBSD 6.3 and above ifeq ($(TARGET),openbsd) set_target_defaults = $(call default_opts, \ - USE_POLL USE_TPROXY USE_THREAD USE_KQUEUE USE_ACCEPT4 USE_CLOSEFROM \ - USE_GETADDRINFO) + USE_POLL USE_TPROXY USE_LIBCRYPT USE_THREAD USE_KQUEUE USE_ACCEPT4 \ + USE_CLOSEFROM USE_GETADDRINFO) endif # NetBSD 8 and above @@ -493,10 +493,12 @@ BUILD_FEATURES := $(foreach opt,$(patsubst USE_%,%,$(use_opts)),$(if $(USE_$(opt OPTIONS_CFLAGS += $(foreach opt,$(use_opts),$(if $($(opt)),-D$(opt),)) ifneq ($(USE_LIBCRYPT),) +ifneq ($(TARGET),openbsd) ifneq ($(TARGET),osx) OPTIONS_LDFLAGS += -lcrypt endif endif +endif ifneq ($(USE_SLZ),) # Use SLZ_INC and SLZ_LIB to force path to zlib.h and libz.{a,so} if needed. -- 2.47.3