From: SASANO Takayoshi <uaa@uaa.org.uk>
Date: Wed, 13 Jul 2022 12:36:59 +0000 (+0900)
Subject: add DragonFlyBSD build support (except test/)
X-Git-Tag: v1.2.8~6
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=60c1430b43a0e8f3fcf1a3402dc0a9b2060d9a9c;p=alsa-lib.git

add DragonFlyBSD build support (except test/)

due to undefined reference to 'environ' error, ucm_exec.c uses workaround.

Fixes: https://github.com/alsa-project/alsa-lib/pull/250
Signed-off-by: SASANO Takayoshi <uaa@uaa.org.uk>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/src/conf.c b/src/conf.c
index 029a0db4..eb38c344 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -4115,7 +4115,7 @@ static int config_file_load(snd_config_t *root, const char *fn, int errors)
 	if (!S_ISDIR(st.st_mode))
 		return config_file_open(root, fn);
 #ifndef DOC_HIDDEN
-#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__sun) && !defined(ANDROID)
+#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) && !defined(__sun) && !defined(ANDROID)
 #define SORTFUNC	versionsort64
 #else
 #define SORTFUNC	alphasort64
diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
index c16956f1..4803b81b 100644
--- a/src/pcm/pcm_direct.c
+++ b/src/pcm/pcm_direct.c
@@ -44,7 +44,7 @@
  *
  */
  
-#if !defined(__OpenBSD__)
+#if !defined(__OpenBSD__) && !defined(__DragonFly__)
 union semun {
 	int              val;    /* Value for SETVAL */
 	struct semid_ds *buf;    /* Buffer for IPC_STAT, IPC_SET */
diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index 56d67e50..f7c0b527 100644
--- a/src/ucm/parser.c
+++ b/src/ucm/parser.c
@@ -2907,7 +2907,7 @@ int uc_mgr_scan_master_configs(const char **_list[])
 		snprintf(filename, sizeof(filename), "%s/ucm2/conf.virt.d",
 			 snd_config_topdir());
 
-#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__sun) && !defined(ANDROID)
+#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) && !defined(__sun) && !defined(ANDROID)
 #define SORTFUNC	versionsort64
 #else
 #define SORTFUNC	alphasort64
diff --git a/src/ucm/ucm_exec.c b/src/ucm/ucm_exec.c
index 500a3b13..276cf592 100644
--- a/src/ucm/ucm_exec.c
+++ b/src/ucm/ucm_exec.c
@@ -33,10 +33,14 @@
 #include <limits.h>
 #include <dirent.h>
 
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
 #include <signal.h>
+#if defined(__DragonFly__)
+#define environ NULL /* XXX */
+#else
 extern char **environ;
 #endif
+#endif
 
 static pthread_mutex_t fork_lock = PTHREAD_MUTEX_INITIALIZER;