mirror of
https://git.freebsd.org/ports.git
synced 2025-06-30 17:10:33 -04:00
dfa121d9d9
o Allow radius and presence modules to be turned off; o don't override CFLAGS; o don't duplicate error messages to the console; o postgresql backend doesn't set NULL flag on results properly, so that don't use VAL_NULL() macros on them; o reconnect to MySQL db when necessary; o relax transaction matching rules, so that it works with wider range of phones; o add some missed sanity checks in usrloc; o ignore incoming UDP messages that are shorter than certain limin (128 bytes). They cannot be SIP messages anyway.
154 lines
4.2 KiB
Text
154 lines
4.2 KiB
Text
|
|
$FreeBSD$
|
|
|
|
--- Makefile.defs.orig
|
|
+++ Makefile.defs
|
|
@@ -169,10 +169,11 @@
|
|
INSTALL-TOUCH = touch # used to create the file first (good to
|
|
# make solaris install work)
|
|
INSTALL-CFG = $(INSTALL) -m 644
|
|
-INSTALL-BIN = $(INSTALL) -m 755
|
|
-INSTALL-MODULES = $(INSTALL) -m 755
|
|
-INSTALL-DOC = $(INSTALL) -m 644
|
|
-INSTALL-MAN = $(INSTALL) -m 644
|
|
+INSTALL-BIN = $(BSD_INSTALL_PROGRAM)
|
|
+INSTALL-MODULES = $(BSD_INSTALL_PROGRAM)
|
|
+INSTALL-DOC = $(BSD_INSTALL_MAN)
|
|
+INSTALL-MAN = $(BSD_INSTALL_MAN)
|
|
+INSTALL-SCRIPT = $(BSD_INSTALL_SCRIPT)
|
|
|
|
#set some vars from the environment (and not make builtins)
|
|
CC := $(shell echo "$${CC}")
|
|
@@ -464,8 +465,8 @@
|
|
found_lock_method=yes
|
|
endif
|
|
|
|
-CFLAGS=
|
|
-LDFLAGS=
|
|
+#CFLAGS=
|
|
+#LDFLAGS=
|
|
# setting CFLAGS
|
|
ifeq ($(mode), release)
|
|
#if i386
|
|
@@ -473,15 +474,14 @@
|
|
# if gcc
|
|
ifeq ($(CC_NAME), gcc)
|
|
#common stuff
|
|
- CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) \
|
|
+ CFLAGS+=-funroll-loops -Wcast-align $(PROFILE) \
|
|
-Wall
|
|
#if gcc 4.0+
|
|
ifeq ($(CC_SHORTVER), 4.x)
|
|
CPU ?= athlon64
|
|
CFLAGS+=-minline-all-stringops -malign-double \
|
|
-falign-loops \
|
|
- -ftree-vectorize \
|
|
- -mtune=$(CPU)
|
|
+ -ftree-vectorize
|
|
else
|
|
#if gcc 3.4+
|
|
ifeq ($(CC_SHORTVER), 3.4)
|
|
@@ -515,7 +515,7 @@
|
|
|
|
else # CC_NAME, gcc
|
|
ifeq ($(CC_NAME), icc)
|
|
- CFLAGS=-g -O3 -ipo -ipo_obj -unroll $(PROFILE) \
|
|
+ CFLAGS+=-ipo -ipo_obj -unroll $(PROFILE) \
|
|
-tpp6 -xK #-openmp #optimize for PIII
|
|
# -prefetch doesn't seem to work
|
|
#( ty to inline acroos files, unroll loops,prefetch,
|
|
@@ -533,7 +533,7 @@
|
|
# if gcc
|
|
ifeq ($(CC_NAME), gcc)
|
|
#common stuff
|
|
- CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) \
|
|
+ CFLAGS+=-funroll-loops -Wcast-align $(PROFILE) \
|
|
-Wall
|
|
#if gcc 4.0+
|
|
ifeq ($(CC_SHORTVER), 4.x)
|
|
@@ -575,7 +575,7 @@
|
|
|
|
else # CC_NAME, gcc
|
|
ifeq ($(CC_NAME), icc)
|
|
- CFLAGS=-g -O3 -ipo -ipo_obj -unroll $(PROFILE) \
|
|
+ CFLAGS+=-ipo -ipo_obj -unroll $(PROFILE) \
|
|
-tpp6 -xK #-openmp #optimize for PIII
|
|
# -prefetch doesn't seem to work
|
|
#( ty to inline acroos files, unroll loops,prefetch,
|
|
@@ -593,7 +593,7 @@
|
|
#if gcc
|
|
ifeq ($(CC_NAME), gcc)
|
|
#common stuff
|
|
- CFLAGS=-g -O9 -funroll-loops $(PROFILE) \
|
|
+ CFLAGS+=-funroll-loops $(PROFILE) \
|
|
-Wall\
|
|
#-Wcast-align \
|
|
#-Wmissing-prototypes
|
|
@@ -667,7 +667,7 @@
|
|
# if gcc
|
|
ifeq ($(CC_NAME), gcc)
|
|
#common stuff
|
|
- CFLAGS=-O9 -funroll-loops -Wcast-align $(PROFILE) \
|
|
+ CFLAGS+=-funroll-loops -Wcast-align $(PROFILE) \
|
|
-Wall
|
|
#if gcc 4.x+
|
|
ifeq ($(CC_SHORTVER), 4.x)
|
|
@@ -709,7 +709,7 @@
|
|
# if gcc
|
|
ifeq ($(CC_NAME), gcc)
|
|
#common stuff
|
|
- CFLAGS=-O9 -funroll-loops -Wcast-align $(PROFILE) \
|
|
+ CFLAGS+=-funroll-loops -Wcast-align $(PROFILE) \
|
|
-Wall
|
|
#if gcc 4.0+
|
|
ifeq ($(CC_SHORTVER), 4.x)
|
|
@@ -751,7 +751,7 @@
|
|
# if gcc
|
|
ifeq ($(CC_NAME), gcc)
|
|
#common stuff
|
|
- CFLAGS= -mips2 -O9 -funroll-loops $(PROFILE) \
|
|
+ CFLAGS+= -mips2 -funroll-loops $(PROFILE) \
|
|
-Wall
|
|
#if gcc 4.0+
|
|
ifeq ($(CC_SHORTVER), 4.x)
|
|
@@ -932,7 +932,7 @@
|
|
# -andrei
|
|
else #mode,release
|
|
ifeq ($(CC_NAME), gcc)
|
|
- CFLAGS=-g -Wcast-align $(PROFILE)
|
|
+ CFLAGS+=-Wcast-align $(PROFILE)
|
|
ifeq ($(ARCH), sparc64)
|
|
CFLAGS+= -mcpu=ultrasparc
|
|
endif
|
|
@@ -947,12 +947,12 @@
|
|
endif
|
|
endif
|
|
ifeq ($(CC_NAME), icc)
|
|
- CFLAGS=-g $(PROFILE)
|
|
+ CFLAGS+=$(PROFILE)
|
|
LDFLAGS+=-g -Wl,-E $(PROFILE)
|
|
MOD_LDFLAGS=-shared $(LDFLAGS)
|
|
endif
|
|
ifeq ($(CC_NAME), suncc)
|
|
- CFLAGS= -g $(PROFILE)
|
|
+ CFLAGS+= $(PROFILE)
|
|
LDFLAGS+=-g $(PROFILE)
|
|
MOD_LDFLAGS=-G $(LDFLAGS)
|
|
endif
|
|
@@ -1028,13 +1028,14 @@
|
|
|
|
ifeq ($(OS), freebsd)
|
|
DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \
|
|
- -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_CONNECT_ECONNRESET_BUG
|
|
+ -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_CONNECT_ECONNRESET_BUG \
|
|
+ -I$(LOCALBASE)/include
|
|
ifneq ($(found_lock_method), yes)
|
|
DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems
|
|
found_lock_method=yes
|
|
LIBS= -pthread -lfl #dlopen is in libc
|
|
else
|
|
- LIBS= -lfl #dlopen is in libc
|
|
+ LIBS= -lfl -L$(LOCALBASE)/lib #dlopen is in libc
|
|
endif
|
|
YACC=yacc
|
|
endif
|