From 1069f41bb8a8b6d31d5e41f0dbb0c3774efdb725 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Wed, 16 May 2018 01:33:48 +0000 Subject: [PATCH] Force WITHOUT_FREEBSD_UPDATE when WITHOUT_PORTSNAP is set freebsd-update depends on phttpget from portsnap. We could move phttpget out of portsnap and build it as long as WITHOUT_FREEBSD_UPDATE and WITHOUT_PORTSNAP are not both set, but for now just make the dependency explicit. PR: 228220 Reported by: Dries Michiels Sponsored by: The FreeBSD Foundation --- share/mk/src.opts.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 8638098acf79..334a4fb02865 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -424,6 +424,11 @@ MK_KERBEROS:= no MK_AUTHPF:= no .endif +.if ${MK_PORTSNAP} == "no" +# freebsd-update depends on phttpget from portsnap +MK_FREEBSD_UPDATE:= no +.endif + .if ${MK_TESTS} == "no" MK_DTRACE_TESTS:= no .endif