70 lines
2.7 KiB
Plaintext
70 lines
2.7 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.29 2010/08/27 00:48:19 sthen Exp $
|
|
--- Makefile.orig Thu Jun 10 21:35:06 2010
|
|
+++ Makefile Wed Jun 30 15:25:51 2010
|
|
@@ -121,7 +121,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
|
|
OVERWRITE=y
|
|
|
|
# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
|
|
-DEBUG=-g3
|
|
+#DEBUG=-g3
|
|
|
|
|
|
# Define standard directories for various platforms
|
|
@@ -181,8 +181,10 @@ HTTP_CGIDIR=/var/www/cgi-bin
|
|
# The file /etc/asterisk.makeopts will also be included but can be overridden
|
|
# by the file in your home directory.
|
|
|
|
+ifneq ($(OSARCH),OpenBSD)
|
|
GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
|
|
USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
|
|
+endif
|
|
|
|
MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
|
|
OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
|
|
@@ -225,7 +227,9 @@ endif
|
|
|
|
ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
|
|
ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),)
|
|
+ ifneq ($(OSARCH),OpenBSD)
|
|
_ASTCFLAGS+=-pipe
|
|
+ endif
|
|
endif
|
|
endif
|
|
|
|
@@ -251,7 +255,9 @@ endif
|
|
|
|
ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
|
|
ifneq ($(PROC),ultrasparc)
|
|
+ ifneq ($(OSARCH),OpenBSD)
|
|
_ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
|
|
+ endif
|
|
endif
|
|
endif
|
|
|
|
@@ -728,18 +734,18 @@ samples: adsi
|
|
echo " ; temporary codec translation path for a channel that may not otherwise require one." ; \
|
|
echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
|
|
echo ";sendfullybooted = yes ; Send the FullyBooted AMI event on AMI login and when all modules are finished loading" ; \
|
|
- echo ";runuser = asterisk ; The user to run as" ; \
|
|
- echo ";rungroup = asterisk ; The group to run as" ; \
|
|
+ echo "runuser = _asterisk ; The user to run as" ; \
|
|
+ echo "rungroup = _asterisk ; The group to run as" ; \
|
|
echo ";lightbackground = yes ; If your terminal is set for a light-colored background" ; \
|
|
echo "documentation_language = en_US ; Set the Language you want Documentation displayed in. Value is in the same format as locale names" ; \
|
|
echo ";hideconnect = yes ; Hide messages displayed when a remote console connects and disconnects" ; \
|
|
echo "" ; \
|
|
echo "; Changing the following lines may compromise your security." ; \
|
|
- echo ";[files]" ; \
|
|
- echo ";astctlpermissions = 0660" ; \
|
|
- echo ";astctlowner = root" ; \
|
|
- echo ";astctlgroup = apache" ; \
|
|
- echo ";astctl = asterisk.ctl" ; \
|
|
+ echo "[files]" ; \
|
|
+ echo "astctlpermissions = 0660" ; \
|
|
+ echo "astctlowner = _asterisk" ; \
|
|
+ echo "astctlgroup = wheel" ; \
|
|
+ echo "astctl = asterisk.ctl" ; \
|
|
echo "" ; \
|
|
echo "[compat]" ; \
|
|
echo "pbx_realtime=1.6" ; \
|