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 029a0db41654dd165466a1f5eba4284630677326..eb38c3442bc2a3675ff64222a1442d757247d0e8 100644 (file)
--- 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 c16956f10873db9809f7b7cafcc542b771ab7b01..4803b81b4ee8e61e0b5770cc93966cdc8fed486e 100644 (file)
--- 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 56d67e500ad095aba8127349092f9ade7be728d1..f7c0b5275cde17979e105a9d1bf7bc60400024c5 100644 (file)
--- 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 500a3b1312572671e3fc83f81fcece4b62d293b2..276cf592d15b1523aa864a6d2e114a82f46e2dc3 100644 (file)
--- 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;