[Asterisk-code-review] BuildSystem: Add DragonFly BSD. (asterisk[15])
Jenkins2
asteriskteam at digium.com
Mon Apr 30 09:05:30 CDT 2018
Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/8843 )
Change subject: BuildSystem: Add DragonFly BSD.
......................................................................
BuildSystem: Add DragonFly BSD.
ASTERISK-27820
Change-Id: I310896143e94d65da1c2be3bb448204a8b86d557
---
M bootstrap.sh
M bridges/bridge_softmix/include/bridge_softmix_internal.h
M channels/chan_oss.c
M configure
M configure.ac
M include/asterisk/endian.h
M main/asterisk.c
M main/utils.c
M res/res_http_post.c
M utils/muted.c
M utils/streamplayer.c
11 files changed, 16 insertions(+), 12 deletions(-)
Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Jenkins2: Approved for Submit
diff --git a/bootstrap.sh b/bootstrap.sh
index 106f202..baf9474 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -13,6 +13,10 @@
# On Linux, environment variables tell which one to use.
case `uname -sr` in
+ DragonFly*)
+ MY_AC_VER=
+ MY_AM_VER=
+ ;;
FreeBSD*)
MY_AC_VER=
MY_AM_VER=
diff --git a/bridges/bridge_softmix/include/bridge_softmix_internal.h b/bridges/bridge_softmix/include/bridge_softmix_internal.h
index 3aa9091..15856b3 100644
--- a/bridges/bridge_softmix/include/bridge_softmix_internal.h
+++ b/bridges/bridge_softmix/include/bridge_softmix_internal.h
@@ -57,7 +57,7 @@
#include <fftw3.h>
#endif
-#if defined(__Darwin__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__)
+#if defined(__Darwin__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__CYGWIN__)
#include <float.h>
#else
#include <values.h>
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 69863d2..7866813 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -51,7 +51,7 @@
#ifdef __linux
#include <linux/soundcard.h>
-#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__) || defined(__sun)
+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__CYGWIN__) || defined(__GLIBC__) || defined(__sun)
#include <sys/soundcard.h>
#else
#include <soundcard.h>
diff --git a/configure b/configure
index e38e85e..c715ccd 100755
--- a/configure
+++ b/configure
@@ -4674,7 +4674,7 @@
CPPFLAGS=-I/usr/pkg/include
LDFLAGS=-L/usr/pkg/lib
;;
- freebsd*)
+ dragonfly*|freebsd*)
ac_default_prefix=/usr/local
CPPFLAGS=-I/usr/local/include
LDFLAGS=-L/usr/local/lib
@@ -4763,7 +4763,7 @@
PBX_WINARCH=0
case "${host_os}" in
- freebsd*)
+ dragonfly*|freebsd*)
OSARCH=FreeBSD
;;
netbsd*)
diff --git a/configure.ac b/configure.ac
index 583a576..1075c14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@
CPPFLAGS=-I/usr/pkg/include
LDFLAGS=-L/usr/pkg/lib
;;
- freebsd*)
+ dragonfly*|freebsd*)
ac_default_prefix=/usr/local
CPPFLAGS=-I/usr/local/include
LDFLAGS=-L/usr/local/lib
@@ -152,7 +152,7 @@
PBX_WINARCH=0
case "${host_os}" in
- freebsd*)
+ dragonfly*|freebsd*)
OSARCH=FreeBSD
;;
netbsd*)
diff --git a/include/asterisk/endian.h b/include/asterisk/endian.h
index fd3eb60..63dd4de 100644
--- a/include/asterisk/endian.h
+++ b/include/asterisk/endian.h
@@ -31,7 +31,7 @@
#ifndef __BYTE_ORDER
#ifdef __linux__
#include <endian.h>
-#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
+#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__APPLE__)
#if defined(__OpenBSD__)
#include "asterisk/compat.h"
#endif
diff --git a/main/asterisk.c b/main/asterisk.c
index 54dcca2..ba25a2c 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -170,7 +170,7 @@
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/vmmeter.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
#include <vm/vm_param.h>
#endif
#if defined(HAVE_SWAPCTL)
diff --git a/main/utils.c b/main/utils.c
index c7795cf..dae994d 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -2466,7 +2466,7 @@
return os;
}
-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__)
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__Darwin__)
#include <ifaddrs.h>
#include <net/if_dl.h>
diff --git a/res/res_http_post.c b/res/res_http_post.c
index f36b772..2e16dc3 100644
--- a/res/res_http_post.c
+++ b/res/res_http_post.c
@@ -36,7 +36,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <gmime/gmime.h>
-#if defined (__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__Darwin__)
+#if defined (__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__Darwin__)
#include <libgen.h>
#endif
diff --git a/utils/muted.c b/utils/muted.c
index ee1de7f..2cdd7e2 100644
--- a/utils/muted.c
+++ b/utils/muted.c
@@ -55,7 +55,7 @@
#include <sys/types.h>
#include <pwd.h>
#include <sys/stat.h>
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__GLIBC__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__GLIBC__)
#include <sys/soundcard.h>
#endif
#include <stdio.h>
diff --git a/utils/streamplayer.c b/utils/streamplayer.c
index 809bd64..543efda 100644
--- a/utils/streamplayer.c
+++ b/utils/streamplayer.c
@@ -53,7 +53,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) || defined(__CYGWIN__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) || defined(__CYGWIN__) || defined(__DragonFly__)
#include <netinet/in.h>
#endif
#include <sys/time.h>
--
To view, visit https://gerrit.asterisk.org/8843
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: merged
Gerrit-Change-Id: I310896143e94d65da1c2be3bb448204a8b86d557
Gerrit-Change-Number: 8843
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180430/af2ae517/attachment.html>
More information about the asterisk-code-review
mailing list