sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:kamailio_3.0: xmlrpc: fix includes and libs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: 9d7d827f7a1d61deb6d79d421c89fd6727cc0a02 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d7d827… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 18:56:57 2010 +0200 xmlrpc: fix includes and libs Reported-by: Olle E. Johansson oej edvina net (cherry picked from commit ecc9fcf9fe61cb355864bf8142e65b8dd9d8658b) --- modules/xmlrpc/Makefile | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/xmlrpc/Makefile b/modules/xmlrpc/Makefile index efcbf38..485d12a 100644 --- a/modules/xmlrpc/Makefile +++ b/modules/xmlrpc/Makefile @@ -6,8 +6,9 @@ include ../../Makefile.defs auto_gen= NAME=xmlrpc.so -DEFS += -I/usr/include/libxml2 -I/usr/local/include/libxml2 -I/usr/local/include -LIBS +=-lxml2 +INCLUDES += -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ + -I$(LOCALBASE)/include +LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 DEFS+=-DSER_MOD_INTERFACE

14 years, 5 months

git:kamailio_3.0: presence_dialoginfo(k): fix bsd compilation

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: cc3351c1b9ee0df6aa43c6382cf577c382687043 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc3351c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 19:31:14 2010 +0200 presence_dialoginfo(k): fix bsd compilation On FreeBSD don't define _XOPEN_SOURCE (define it only on linux). It's not needed for strptime() and worse will cause some other defines to be missing, like INADDR_LOOPBACK ( if_XOPEN_SOURCE is defined, __BSD_VISIBLE will be undefined => lots of missing defines). Reported-by: Reported-by: Olle E. Johansson oej edvina net (cherry picked from commit 850a7b31de86056fc9223d809dfae54b0e490c5f) --- modules_k/presence_dialoginfo/pidf.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/presence_dialoginfo/pidf.c b/modules_k/presence_dialoginfo/pidf.c index 9285d2b..d90de4c 100644 --- a/modules_k/presence_dialoginfo/pidf.c +++ b/modules_k/presence_dialoginfo/pidf.c @@ -36,12 +36,12 @@ * use 600 for 'Single UNIX Specification, Version 3' * _XOPEN_SOURCE creates conflict in header definitions in Solaris */ -#ifndef __OS_solaris - #define _XOPEN_SOURCE 600 /* glibc2 on linux, bsd */ +#ifdef __OS_linux + #define _XOPEN_SOURCE 600 /* glibc2 on linux */ #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect of the above define on features.h/unistd.h syscall() */ -#else +#elif defined __OS_solaris #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif

14 years, 5 months

git:kamailio_3.0: core: fix unclosed comment

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: f92afdbac5429538d11466123bd723044636e87f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f92afdb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Aug 13 22:25:34 2010 +0200 core: fix unclosed comment (cherry picked from commit b4f7c405a7c15a950ce50561a5a61fb36d59bc28) --- io_wait.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/io_wait.c b/io_wait.c index 72e34ee..a7d0527 100644 --- a/io_wait.c +++ b/io_wait.c @@ -389,7 +389,7 @@ enum poll_types choose_poll_method() /* all DragonFly versions have kqueque */ #ifndef __OS_dragonfly if (_os_ver>=0x0401) /* if ver >= 4.1 */ - #endif /**__OS_dragonfly + #endif /**__OS_dragonfly */ #elif defined (__OS_netbsd) if (_os_ver>=0x020000) /* if ver >= 2.0 */ #elif defined (__OS_openbsd)

14 years, 5 months

git:kamailio_3.0: sercmd: fix LIBS - don't link -lresolv if not needed

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: 3ed79ac954831d8639a80388cf02116f0d93386b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ed79ac… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 18:51:09 2010 +0200 sercmd: fix LIBS - don't link -lresolv if not needed - link with libresolv only on linux, solaris and darwin - on solaris link also witl -lxnet and -lnsl (bugs introduced in b0f00c3348b9) (cherry picked from commit e5978c182e4bd5d5c1d723d00e9f54ea958816c8) --- utils/sercmd/Makefile | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/utils/sercmd/Makefile b/utils/sercmd/Makefile index 7072a7d..bc03b74 100644 --- a/utils/sercmd/Makefile +++ b/utils/sercmd/Makefile @@ -29,14 +29,29 @@ DEFS:= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' \ # from a module Makefile) #LIBS:=$(filter-out -lfl -ldl -lpthread -lssl -lcrypto, $(LIBS)) +ifeq ($(OS), linux) + LIBS:= -lresolv +endif +ifeq ($(OS), solaris) + LIBS:= -lresolv -L$(LOCALBASE)/lib -lxnet -lnsl +endif +ifeq ($(OS), freebsd) + LIBS:= +endif ifeq ($(OS), dragonfly) LIBS:= -L$(LOCALBASE)/lib -else +endif +ifeq ($(OS), openbsd) + LIBS:= +endif +ifeq ($(OS), netbsd) + LIBS:= +endif +ifeq ($(OS), darwin) LIBS:= -lresolv endif - -ifeq ($(OS), solaris) - LIBS+= -L$(LOCALBASE)/lib -lxnet -lnsl +ifneq (,$(findstring cygwin, $(OS))) + LIBS:= -lresolv endif ifeq ($(use_readline),)

14 years, 5 months

git:kamailio_3.0: kamctl: fix make use and make install

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: 29c162adab9a978ce189dd4c71a925490e68f960 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29c162a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 19:49:09 2010 +0200 kamctl: fix make use and make install - use $(MAKE) instead of directly using make. - added targets for the install dirs (create bin_dir, cfg_dir and man_dirs if missing). This fixes make -C utils/kamctl install (allows installing only kamctl). (cherry picked from commit 91ce090529ac1a1c6285f387e57013cad5598def) --- utils/kamctl/Makefile | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index 61bcee0..79c15c7 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -181,7 +181,7 @@ install-modules: $(bin_prefix)/$(bin_dir) $(data_prefix)/$(data_dir)/oracle/admin/`basename "$$FILE"` ; \ fi ;\ done ; \ - make -C ../db_oracle/ ; \ + $(MAKE) -C ../db_oracle/ ; \ $(INSTALL_BIN) ../db_oracle/kamailio_orasel $(bin_prefix)/$(bin_dir) ; \ fi # install Berkeley database stuff @@ -206,7 +206,7 @@ install-modules: $(bin_prefix)/$(bin_dir) $(data_prefix)/$(data_dir)/db_berkeley/kamailio/`basename "$$FILE"` ; \ fi ;\ done ; \ - make -C ../db_berkeley/ ; \ + $(MAKE) -C ../db_berkeley/ ; \ $(INSTALL_BIN) ../db_berkeley/kambdb_recover $(bin_prefix)/$(bin_dir) ; \ fi # install dbtext stuff @@ -236,3 +236,15 @@ install-modules: $(bin_prefix)/$(bin_dir) done ;\ fi + +$(cfg_prefix)/$(cfg_dir): + mkdir -p $(cfg_prefix)/$(cfg_dir) + +$(bin_prefix)/$(bin_dir): + mkdir -p $(bin_prefix)/$(bin_dir) + +$(man_prefix)/$(man_dir)/man8: + mkdir -p $(man_prefix)/$(man_dir)/man8 + +$(man_prefix)/$(man_dir)/man5: + mkdir -p $(man_prefix)/$(man_dir)/man5

14 years, 5 months

git:kamailio_3.0: sercmd: Patch to add Dragonfly BSD support (makefile)

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: 09f89961914b6461a626e9eed970bdafca9102a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09f8996… Author: Vincent Stemen <vince.lists(a)ngtek.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:49:40 2010 +0200 sercmd: Patch to add Dragonfly BSD support (makefile) Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> (cherry picked from commit c39dd933973ba24b449c2b35756c593c093d5f4f) --- utils/sercmd/Makefile | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/utils/sercmd/Makefile b/utils/sercmd/Makefile index fbf616d..7072a7d 100644 --- a/utils/sercmd/Makefile +++ b/utils/sercmd/Makefile @@ -29,7 +29,12 @@ DEFS:= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' \ # from a module Makefile) #LIBS:=$(filter-out -lfl -ldl -lpthread -lssl -lcrypto, $(LIBS)) -LIBS:= -lresolv +ifeq ($(OS), dragonfly) + LIBS:= -L$(LOCALBASE)/lib +else + LIBS:= -lresolv +endif + ifeq ($(OS), solaris) LIBS+= -L$(LOCALBASE)/lib -lxnet -lnsl endif

14 years, 5 months

git:kamailio_3.0: NEWS: notes about Dragonfly BSD support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: e6a3241fc7ca837e615476579f1b4bbf2c09a78a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6a3241… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 17:04:14 2010 +0200 NEWS: notes about Dragonfly BSD support (cherry picked from commit f6b240d51684040572c75555b1f767df0100d970) --- INSTALL | 902 ++++++++++++++++++++++++++++++++++++++------------------------- NEWS | 1 + 2 files changed, 549 insertions(+), 354 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e6a…

14 years, 5 months

git:kamailio_3.0: makefile: Dragonfly BSD support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: aabb5829213fba878df2c3836bd26a09d2a78197 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aabb582… Author: Vincent Stemen <vince.lists(a)ngtek.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:58:04 2010 +0200 makefile: Dragonfly BSD support This also simplifies the platform directory path settings so that the ifeq() statements are not nested 5 levels deep. Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> (cherry picked from commit 7d27010d3aa8ead2d9fec4155c5146d4329b7c35) --- Makefile.defs | 89 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 75 insertions(+), 14 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 2c79eb4..7cf0c82 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -225,45 +225,54 @@ share_dir = share/$(MAIN_NAME)/ # lib/$(MAIN_NAME)/modules , lib/$(MAIN_NAME)/modules-s, lib/$(MAIN_NAME)/modules-k modules_dir = lib/$(MAIN_NAME)/ lib_dir = lib/$(MAIN_NAME)/ + +doc_dir = doc/$(MAIN_NAME)/ +man_dir = man/ +data_dir = $(MAIN_NAME)/ + ifeq ($(OS), linux) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = share/man/ data_dir = share/$(MAIN_NAME)/ LOCALBASE ?= /usr/local -else +endif + ifeq ($(OS), freebsd) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ data_dir = share/$(MAIN_NAME)/ LOCALBASE ?= /usr/local -else +endif + ifeq ($(OS), openbsd) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ data_dir = share/$(MAIN_NAME)/ LOCALBASE ?= /usr/local -else +endif + ifeq ($(OS), netbsd) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ data_dir = share/$(MAIN_NAME)/ LOCALBASE ?= /usr/pkg -else -ifeq ($(OS), darwin) +endif + +ifeq ($(OS), dragonfly) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ data_dir = share/$(MAIN_NAME)/ - LOCALBASE ?= /usr/local -else - doc_dir = doc/$(MAIN_NAME)/ + LOCALBASE ?= /usr/pkg +endif + +ifeq ($(OS), darwin) + doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ - data_dir = $(MAIN_NAME)/ + data_dir = share/$(MAIN_NAME)/ LOCALBASE ?= /usr/local endif -endif -endif -endif -endif + +LOCALBASE ?= /usr/local # Doxygen directory doxygen_dir=doc/doxygen @@ -614,10 +623,18 @@ $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>) # adds support for Application Server interface # Sometimes is needes correct non-quoted $OS. HACK: gcc translates known OS to number ('linux'), so there is added underscore +# Tell it that dragonflybsd is equivalent to compiling for freebsd. +# This will cause __OS_freebsd to be defined below. +ifeq ($(OS), dragonfly) + EQUIV_OS := freebsd +else + EQUIV_OS := $(OS) +endif + C_DEFS= $(extra_defs) \ -DNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \ -DOS='$(OS)_' -DOS_QUOTED='"$(OS)"' -DCOMPILER='"$(CC_VER)"'\ - -D__CPU_$(ARCH) -D__OS_$(OS) \ + -D__CPU_$(ARCH) -D__OS_$(EQUIV_OS) \ -DSER_VER=$(SER_VER) \ -DCFG_DIR='"$(cfg_target)"'\ -DPKG_MALLOC \ @@ -1785,6 +1802,50 @@ $(info "old freebsd version (>= 7.0 needed) -- sctp disabled") endif # SCTP endif +ifeq ($(OS), dragonfly) + C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \ + -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL \ + -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ + -DHAVE_NETINET_IN_SYSTM + ifneq ($(found_lock_method), yes) + C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems + found_lock_method=yes + LIBS+= -pthread #dlopen is in libc + else + LIBS= #dlopen is in libc + endif + # check for ver >= 4.1 + ifeq ($(shell [ $(OSREL_N) -gt 4001 ] && echo has_kqueue), has_kqueue) + ifeq ($(NO_KQUEUE),) + C_DEFS+=-DHAVE_KQUEUE + endif + endif + ifeq ($(NO_SELECT),) + C_DEFS+=-DHAVE_SELECT + endif + YACC=yacc + # sctp support + ifeq ($(SCTP),1) + # test to see if the devfiles and lib are installed + sctp_dev_locations := /usr/include/netinet/sctp.h \ + $(LOCALBASE)/include/netinet/sctp.h + sctp_dev_path := $(wildcard $(sctp_dev_locations)) + ifeq ($(sctp_dev_path),) +$(info "sctp development files not installed -- sctp disabled") + override SCTP := + endif + ifeq ($(shell [ $(OSREL_N) -lt 7000 ] && echo sctp), sctp) +$(info "old freebsd version (>= 7.0 needed) -- sctp disabled") + override SCTP := + endif + + ifeq ($(SCTP),1) + C_DEFS+=-DUSE_SCTP + LIBS+= # no extra libs needed on freebsd + endif + endif # SCTP +endif + ifeq ($(OS), openbsd) C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 \ -DHAVE_UNION_SEMUN -DHAVE_MSGHDR_MSG_CONTROL \

14 years, 5 months

git:kamailio_3.0: makefile: fix $DESTDIR

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: c4da41b1fce9819df15e5c5f9dafa145392af8b6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4da41b… Author: Vincent Stemen <vince.lists(a)ngtek.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:40:41 2010 +0200 makefile: fix $DESTDIR This fixes Makefile.defs to properly handle $DESTDIR as a base installation directory for packaging, etc (equivalent to BASEDIR). Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> (cherry picked from commit bef528185d7b2e6bfa4ae5ec4bfd4808e1dcf28f) --- Makefile.defs | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 95dad34..2c79eb4 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -268,9 +268,8 @@ endif # Doxygen directory doxygen_dir=doc/doxygen - # install location -DESTDIR ?= $(LOCALBASE) -PREFIX ?= $(DESTDIR) +# install location +PREFIX ?= $(LOCALBASE) prefix = $(PREFIX) # install path is $(basedir) $(prefix) # example: @@ -278,7 +277,7 @@ prefix = $(PREFIX) # basedir=/tmp # prefix=/usr/local -BASEDIR ?= +BASEDIR ?= $(DESTDIR) basedir = $(BASEDIR) # install prefixes for various stuff cfg_prefix = $(basedir)$(prefix)

14 years, 5 months

git:kamailio_3.0: db_text(k) makefile: fix make use

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: 8bc0c9ba5dc1fd9d863cd58c54ce469a6186d81f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8bc0c9b… Author: Vincent Stemen <vince.lists(a)ngtek.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:45:05 2010 +0200 db_text(k) makefile: fix make use This fixes a bug. It called make directly which breaks on platforms where it is being compiled under gmake. Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> (cherry picked from commit 5d8552087be74332c1a7812ffb01d8298060cc62) --- modules_k/db_text/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/db_text/Makefile b/modules_k/db_text/Makefile index dd35b11..36bc48b 100644 --- a/modules_k/db_text/Makefile +++ b/modules_k/db_text/Makefile @@ -24,7 +24,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) # extra install for kamailio install-dbtext-scripts: $(bin_prefix)/$(bin_dir) - DBTEXTON=yes make -C ../../utils/kamctl/ install-modules + DBTEXTON=yes $(MAKE) -C ../../utils/kamctl/ install-modules install-scripts: install-dbtext-scripts

14 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev