From 4bfdaf555b842d4426daf7e2f048eaaaf1784f6b Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Tue, 16 Jul 2024 14:47:56 +0200
Subject: [PATCH] contrib: remove HAVE_BSD for darwin targets

HAVE_DARWIN_OS always has the priority over HAVE_BSD. We only need
one of them. HAVE_BSD will be for other BSD variants.
---
 contrib/bootstrap             | 2 +-
 contrib/src/basu/rules.mak    | 2 --
 contrib/src/gcrypt/rules.mak  | 3 +--
 contrib/src/live555/rules.mak | 3 +--
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 9e1df72532..05626c3f66 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -267,7 +267,7 @@ OS="${HOST#*-}" # strip architecture
 MAKE=make
 case "${OS}" in
 	*-darwin*)
-		add_make_enabled "HAVE_DARWIN_OS" "HAVE_BSD"
+		add_make_enabled "HAVE_DARWIN_OS"
 		if test -z "$BUILDFORIOS"
 		then
 			check_macosx_sdk
diff --git a/contrib/src/basu/rules.mak b/contrib/src/basu/rules.mak
index 95fe0106ad..c40e5c3d52 100644
--- a/contrib/src/basu/rules.mak
+++ b/contrib/src/basu/rules.mak
@@ -13,10 +13,8 @@ endif
 endif
 
 ifdef HAVE_BSD
-ifndef HAVE_DARWIN_OS
 PKGS += basu
 endif
-endif
 
 endif # libsystemd
 endif # libelogind
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 2a00b7f636..3ac7d83d52 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -54,11 +54,10 @@ endif
 ifeq ($(ARCH), x86_64)
 GCRYPT_CONF += ac_cv_sys_symbol_underscore=yes
 endif
-else
+endif
 ifdef HAVE_BSD
 GCRYPT_CONF += --disable-asm --disable-aesni-support
 endif
-endif
 ifdef HAVE_ANDROID
 ifeq ($(ANDROID_ABI), x86)
 GCRYPT_CONF += ac_cv_sys_symbol_underscore=no
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index c170e2de9a..752c48eae7 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -35,11 +35,10 @@ LIVE_EXTRA_CFLAGS += -DNO_GETIFADDRS=1
 endif
 ifdef HAVE_DARWIN_OS
 LIVE_TARGET := macosx-bigsur
-else
+endif
 ifdef HAVE_BSD
 LIVE_TARGET := freebsd
 endif
-endif
 ifdef HAVE_SOLARIS
 ifeq ($(ARCH),x86_64)
 LIVE_TARGET := solaris-64bit