<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8843">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BuildSystem: Add DragonFly BSD.<br><br>ASTERISK-27820<br><br>Change-Id: I310896143e94d65da1c2be3bb448204a8b86d557<br>---<br>M bootstrap.sh<br>M bridges/bridge_softmix/include/bridge_softmix_internal.h<br>M channels/chan_oss.c<br>M configure<br>M configure.ac<br>M include/asterisk/endian.h<br>M main/asterisk.c<br>M main/utils.c<br>M res/res_http_post.c<br>M utils/muted.c<br>M utils/streamplayer.c<br>11 files changed, 16 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/bootstrap.sh b/bootstrap.sh<br>index 106f202..baf9474 100755<br>--- a/bootstrap.sh<br>+++ b/bootstrap.sh<br>@@ -13,6 +13,10 @@<br> # On Linux, environment variables tell which one to use.<br> <br> case `uname -sr` in<br>+ DragonFly*)<br>+ MY_AC_VER=<br>+ MY_AM_VER=<br>+ ;;<br> FreeBSD*)<br> MY_AC_VER=<br> MY_AM_VER=<br>diff --git a/bridges/bridge_softmix/include/bridge_softmix_internal.h b/bridges/bridge_softmix/include/bridge_softmix_internal.h<br>index 3aa9091..15856b3 100644<br>--- a/bridges/bridge_softmix/include/bridge_softmix_internal.h<br>+++ b/bridges/bridge_softmix/include/bridge_softmix_internal.h<br>@@ -57,7 +57,7 @@<br> #include <fftw3.h><br> #endif<br> <br>-#if defined(__Darwin__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__)<br>+#if defined(__Darwin__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__CYGWIN__)<br> #include <float.h><br> #else<br> #include <values.h><br>diff --git a/channels/chan_oss.c b/channels/chan_oss.c<br>index 69863d2..7866813 100644<br>--- a/channels/chan_oss.c<br>+++ b/channels/chan_oss.c<br>@@ -51,7 +51,7 @@<br> <br> #ifdef __linux<br> #include <linux/soundcard.h><br>-#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__) || defined(__sun)<br>+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__CYGWIN__) || defined(__GLIBC__) || defined(__sun)<br> #include <sys/soundcard.h><br> #else<br> #include <soundcard.h><br>diff --git a/configure b/configure<br>index e38e85e..c715ccd 100755<br>--- a/configure<br>+++ b/configure<br>@@ -4674,7 +4674,7 @@<br> CPPFLAGS=-I/usr/pkg/include<br> LDFLAGS=-L/usr/pkg/lib<br> ;;<br>- freebsd*)<br>+ dragonfly*|freebsd*)<br> ac_default_prefix=/usr/local<br> CPPFLAGS=-I/usr/local/include<br> LDFLAGS=-L/usr/local/lib<br>@@ -4763,7 +4763,7 @@<br> PBX_WINARCH=0<br> <br> case "${host_os}" in<br>- freebsd*)<br>+ dragonfly*|freebsd*)<br> OSARCH=FreeBSD<br> ;;<br> netbsd*)<br>diff --git a/configure.ac b/configure.ac<br>index 583a576..1075c14 100644<br>--- a/configure.ac<br>+++ b/configure.ac<br>@@ -67,7 +67,7 @@<br> CPPFLAGS=-I/usr/pkg/include<br> LDFLAGS=-L/usr/pkg/lib<br> ;;<br>- freebsd*)<br>+ dragonfly*|freebsd*)<br> ac_default_prefix=/usr/local<br> CPPFLAGS=-I/usr/local/include<br> LDFLAGS=-L/usr/local/lib<br>@@ -152,7 +152,7 @@<br> PBX_WINARCH=0<br> <br> case "${host_os}" in<br>- freebsd*)<br>+ dragonfly*|freebsd*)<br> OSARCH=FreeBSD<br> ;;<br> netbsd*)<br>diff --git a/include/asterisk/endian.h b/include/asterisk/endian.h<br>index fd3eb60..63dd4de 100644<br>--- a/include/asterisk/endian.h<br>+++ b/include/asterisk/endian.h<br>@@ -31,7 +31,7 @@<br> #ifndef __BYTE_ORDER<br> #ifdef __linux__<br> #include <endian.h><br>-#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)<br>+#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__APPLE__)<br> #if defined(__OpenBSD__)<br> #include "asterisk/compat.h"<br> #endif<br>diff --git a/main/asterisk.c b/main/asterisk.c<br>index 54dcca2..ba25a2c 100644<br>--- a/main/asterisk.c<br>+++ b/main/asterisk.c<br>@@ -170,7 +170,7 @@<br> #include <sys/param.h><br> #include <sys/sysctl.h><br> #include <sys/vmmeter.h><br>-#if defined(__FreeBSD__)<br>+#if defined(__FreeBSD__) || defined(__DragonFly__)<br> #include <vm/vm_param.h><br> #endif<br> #if defined(HAVE_SWAPCTL)<br>diff --git a/main/utils.c b/main/utils.c<br>index c7795cf..dae994d 100644<br>--- a/main/utils.c<br>+++ b/main/utils.c<br>@@ -2466,7 +2466,7 @@<br> return os;<br> }<br> <br>-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__)<br>+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__Darwin__)<br> #include <ifaddrs.h><br> #include <net/if_dl.h><br> <br>diff --git a/res/res_http_post.c b/res/res_http_post.c<br>index f36b772..2e16dc3 100644<br>--- a/res/res_http_post.c<br>+++ b/res/res_http_post.c<br>@@ -36,7 +36,7 @@<br> #include <sys/stat.h><br> #include <fcntl.h><br> #include <gmime/gmime.h><br>-#if defined (__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__Darwin__)<br>+#if defined (__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__Darwin__)<br> #include <libgen.h><br> #endif<br> <br>diff --git a/utils/muted.c b/utils/muted.c<br>index ee1de7f..2cdd7e2 100644<br>--- a/utils/muted.c<br>+++ b/utils/muted.c<br>@@ -55,7 +55,7 @@<br> #include <sys/types.h><br> #include <pwd.h><br> #include <sys/stat.h><br>-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__GLIBC__)<br>+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__GLIBC__)<br> #include <sys/soundcard.h><br> #endif<br> #include <stdio.h><br>diff --git a/utils/streamplayer.c b/utils/streamplayer.c<br>index 809bd64..543efda 100644<br>--- a/utils/streamplayer.c<br>+++ b/utils/streamplayer.c<br>@@ -53,7 +53,7 @@<br> #include <unistd.h><br> #include <sys/types.h><br> #include <sys/socket.h><br>-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) || defined(__CYGWIN__)<br>+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) || defined(__CYGWIN__) || defined(__DragonFly__)<br> #include <netinet/in.h><br> #endif<br> #include <sys/time.h><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8843">change 8843</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8843"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I310896143e94d65da1c2be3bb448204a8b86d557 </div>
<div style="display:none"> Gerrit-Change-Number: 8843 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>