sr-dev April 2011

sr-dev@lists.kamailio.org

27 participants
271 discussions

git:3.1: stun: fix padd macros
by Andrei Pelinescu-Onciul 29 Apr '11

29 Apr '11

Module: sip-router Branch: 3.1 Commit: 66af75fcdda45ed383f8493ea9b3d8b9b8c2cf47 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=66af75f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Apr 30 00:08:11 2011 +0200 stun: fix padd macros The PADDED_TO_* macros did not work when the length was a multiple of the pad value. (FS#129) Reported-by: Francesco Castellano (cherry picked from … [View More]

1 0

git:3.1: Makefile: fix gcc 4.5 support for all archs
by Andrei Pelinescu-Onciul 29 Apr '11

29 Apr '11

Module: sip-router Branch: 3.1 Commit: 2192a1d7a35364fff6241f640bdf7dd282e06447 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2192a1d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Apr 30 00:48:12 2011 +0200 Makefile: fix gcc 4.5 support for all archs Commit c925278 split gcc 4.5 support from the generic 4.2+ support, but it handled gcc 4.5 only for x86_64 (trying to compile … [View More]on other architectures with gcc 4.5 resulted in warnings and common gcc optimization options). (cherry picked from commit fd6704daccd4359f59183367f2059576e184635e) --- Makefile.defs | 68 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index d6d8c6d..91d1435 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -295,7 +295,7 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) -e 's/4\.[2-46-9]$$/4.2+/' \ -e 's/4\.5\..*/4.5/' \ -e 's/4\.5$$/4.5/') -ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+,$(CC_SHORTVER)))) +ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+ 4.5,$(CC_SHORTVER)))) # dependencies can be generated on-the-fly while compiling *.c CC_MKDEP_OPTS=-MMD -MP endif # 3.0 <= $(CC_SHORTVER) <= 4.x @@ -863,8 +863,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) $(call set_if_empty,CPU,athlon64) CFLAGS+=-m32 -minline-all-stringops \ -falign-loops \ @@ -913,7 +913,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc ifeq ($(CC_NAME), icc) @@ -1026,8 +1026,8 @@ ifeq ($(CC_NAME), gcc) CFLAGS=-g -O9 -funroll-loops $(PROFILE) \ #-Wcast-align \ #-Wmissing-prototypes - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) $(call set_if_empty,CPU,ultrasparc) #use 32bit for now CFLAGS+=-m64 -mcpu=ultrasparc \ @@ -1093,7 +1093,7 @@ endif #CC_SHORTVER, 2.9x endif #CC_SHORTVER, 3.0 endif #CC_SHORTVER, 3.4 endif #CC_SHORTVER, 4.x -endif #CC_SHORTVER, 4.2+ +endif #CC_SHORTVER, 4.5 or 4.2+ else #CC_NAME, gcc ifeq ($(CC_NAME), suncc) @@ -1117,8 +1117,8 @@ ifeq ($(CC_NAME), gcc) CFLAGS=-g -O9 -funroll-loops $(PROFILE) \ #-Wcast-align \ #-Wmissing-prototypes - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) $(call set_if_empty,CPU,v8) #use 32bit for now CFLAGS+= -mtune=$(CPU) \ @@ -1159,7 +1159,7 @@ endif #CC_SHORTVER, 2.9x endif #CC_SHORTVER, 3.0 endif #CC_SHORTVER, 3.4 endif #CC_SHORTVER, 4.x -endif #CC_SHORTVER, 4.2+ +endif #CC_SHORTVER, 4.5 or 4.2+ else #CC_NAME, gcc ifeq ($(CC_NAME), suncc) @@ -1180,8 +1180,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS=-O9 -funroll-loops -fsigned-char $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) CFLAGS+= -ftree-vectorize -fno-strict-overflow # not supported on arm: -minline-all-stringops else @@ -1213,7 +1213,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers @@ -1229,8 +1229,8 @@ ifeq ($(CC_NAME), gcc) #common stuff CFLAGS=-march=armv6 -O9 -funroll-loops -fsigned-char \ $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) CFLAGS+= -ftree-vectorize -fno-strict-overflow else #if gcc 4.x+ @@ -1260,7 +1260,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers @@ -1275,8 +1275,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS=-O9 -funroll-loops $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) CFLAGS+=-march=r3000 -minline-all-stringops \ -ftree-vectorize -fno-strict-overflow else @@ -1307,7 +1307,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers @@ -1322,8 +1322,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS= -mips2 -O9 -funroll-loops $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) CFLAGS+=-minline-all-stringops -ftree-vectorize \ -fno-strict-overflow else @@ -1352,7 +1352,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers @@ -1367,8 +1367,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS= -mips64 -O9 -funroll-loops $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) CFLAGS+=-minline-all-stringops -ftree-vectorize \ -fno-strict-overflow else @@ -1397,7 +1397,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers @@ -1412,8 +1412,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS= -O9 -funroll-loops $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) CFLAGS+= -fno-strict-overflow # not supported: -minline-all-stringops else @@ -1443,7 +1443,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers @@ -1458,8 +1458,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS= -O9 -funroll-loops -fsigned-char $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) $(call set_if_empty,CPU,powerpc) CFLAGS+=-ftree-vectorize \ -fno-strict-overflow \ @@ -1492,7 +1492,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers @@ -1507,8 +1507,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS= -O9 -funroll-loops -fsigned-char $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) $(call set_if_empty,CPU,powerpc64) CFLAGS+=-ftree-vectorize \ -fno-strict-overflow \ @@ -1541,7 +1541,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers [View Less]

1 0

git:master: stun: fix attribute padded length outside the packet case
by Andrei Pelinescu-Onciul 29 Apr '11

29 Apr '11

Module: sip-router Branch: master Commit: 677a7bfabd0a266ebdd712b23caee75198993e4a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=677a7bf… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Apr 30 00:11:02 2011 +0200 stun: fix attribute padded length outside the packet case - check if the attribute padded length points still inside the packet (only the un-padded value was checked … [View More]

1 0

git:master: tm: recursive hash locks
by Andrei Pelinescu-Onciul 29 Apr '11

29 Apr '11

Module: sip-router Branch: master Commit: 1699b6a4c479031c116fb081a805635a4d088bcb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1699b6a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 29 19:40:36 2011 +0200 tm: recursive hash locks The hash locks are now recursive/re-entrant. This removes some of the TMCB_REQUEST_IN and TMCB_LOCAL_REQUEST_IN callback restrictions (like do … [View More]

1 0

git:master: Makefile: fix gcc 4.5 support for all archs
by Andrei Pelinescu-Onciul 29 Apr '11

29 Apr '11

Module: sip-router Branch: master Commit: fd6704daccd4359f59183367f2059576e184635e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd6704d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Apr 30 00:48:12 2011 +0200 Makefile: fix gcc 4.5 support for all archs Commit c925278 split gcc 4.5 support from the generic 4.2+ support, but it handled gcc 4.5 only for x86_64 (trying to … [View More]compile on other architectures with gcc 4.5 resulted in warnings and common gcc optimization options). --- Makefile.defs | 68 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 226347b..0bdb654 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -295,7 +295,7 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) -e 's/4\.[2-46-9]$$/4.2+/' \ -e 's/4\.5\..*/4.5/' \ -e 's/4\.5$$/4.5/') -ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+,$(CC_SHORTVER)))) +ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+ 4.5,$(CC_SHORTVER)))) # dependencies can be generated on-the-fly while compiling *.c CC_MKDEP_OPTS=-MMD -MP endif # 3.0 <= $(CC_SHORTVER) <= 4.x @@ -864,8 +864,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) $(call set_if_empty,CPU,athlon64) CFLAGS+=-m32 -minline-all-stringops \ -falign-loops \ @@ -914,7 +914,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc ifeq ($(CC_NAME), icc) @@ -1027,8 +1027,8 @@ ifeq ($(CC_NAME), gcc) CFLAGS=-g -O9 -funroll-loops $(PROFILE) \ #-Wcast-align \ #-Wmissing-prototypes - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) $(call set_if_empty,CPU,ultrasparc) #use 32bit for now CFLAGS+=-m64 -mcpu=ultrasparc \ @@ -1094,7 +1094,7 @@ endif #CC_SHORTVER, 2.9x endif #CC_SHORTVER, 3.0 endif #CC_SHORTVER, 3.4 endif #CC_SHORTVER, 4.x -endif #CC_SHORTVER, 4.2+ +endif #CC_SHORTVER, 4.5 or 4.2+ else #CC_NAME, gcc ifeq ($(CC_NAME), suncc) @@ -1118,8 +1118,8 @@ ifeq ($(CC_NAME), gcc) CFLAGS=-g -O9 -funroll-loops $(PROFILE) \ #-Wcast-align \ #-Wmissing-prototypes - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) $(call set_if_empty,CPU,v8) #use 32bit for now CFLAGS+= -mtune=$(CPU) \ @@ -1160,7 +1160,7 @@ endif #CC_SHORTVER, 2.9x endif #CC_SHORTVER, 3.0 endif #CC_SHORTVER, 3.4 endif #CC_SHORTVER, 4.x -endif #CC_SHORTVER, 4.2+ +endif #CC_SHORTVER, 4.5 or 4.2+ else #CC_NAME, gcc ifeq ($(CC_NAME), suncc) @@ -1181,8 +1181,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS=-O9 -funroll-loops -fsigned-char $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) CFLAGS+= -ftree-vectorize -fno-strict-overflow # not supported on arm: -minline-all-stringops else @@ -1214,7 +1214,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers @@ -1230,8 +1230,8 @@ ifeq ($(CC_NAME), gcc) #common stuff CFLAGS=-march=armv6 -O9 -funroll-loops -fsigned-char \ $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) CFLAGS+= -ftree-vectorize -fno-strict-overflow else #if gcc 4.x+ @@ -1261,7 +1261,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers @@ -1276,8 +1276,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS=-O9 -funroll-loops $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) CFLAGS+=-march=r3000 -minline-all-stringops \ -ftree-vectorize -fno-strict-overflow else @@ -1308,7 +1308,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers @@ -1323,8 +1323,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS= -mips2 -O9 -funroll-loops $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) CFLAGS+=-minline-all-stringops -ftree-vectorize \ -fno-strict-overflow else @@ -1353,7 +1353,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers @@ -1368,8 +1368,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS= -mips64 -O9 -funroll-loops $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) CFLAGS+=-minline-all-stringops -ftree-vectorize \ -fno-strict-overflow else @@ -1398,7 +1398,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers @@ -1413,8 +1413,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS= -O9 -funroll-loops $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) CFLAGS+= -fno-strict-overflow # not supported: -minline-all-stringops else @@ -1444,7 +1444,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers @@ -1459,8 +1459,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS= -O9 -funroll-loops -fsigned-char $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) $(call set_if_empty,CPU,powerpc) CFLAGS+=-ftree-vectorize \ -fno-strict-overflow \ @@ -1493,7 +1493,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers @@ -1508,8 +1508,8 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS= -O9 -funroll-loops -fsigned-char $(PROFILE) - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) + #if gcc 4.5 or 4.2+ +ifeq (,$(strip $(filter-out 4.2+ 4.5,$(CC_SHORTVER)))) $(call set_if_empty,CPU,powerpc64) CFLAGS+=-ftree-vectorize \ -fno-strict-overflow \ @@ -1542,7 +1542,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ +endif # CC_SHORTVER, 4.5 or 4.2+ else # CC_NAME, gcc #other compilers [View Less]

1 0

git:master: stun: fix padd macros
by Andrei Pelinescu-Onciul 29 Apr '11

29 Apr '11

Module: sip-router Branch: master Commit: 263ee122bc55f81db878ddea9ad4aa2bfd8afbae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=263ee12… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Apr 30 00:08:11 2011 +0200 stun: fix padd macros The PADDED_TO_* macros did not work when the length was a multiple of the pad value. (FS#129) Reported-by: Francesco Castellano --- ser_stun.h … [View More]

1 0

[tracker] Task closed: Debian / Ubuntu Packages for Kamailio 3.1.3 Broken
by sip-router 29 Apr '11

29 Apr '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#128 - Debian / Ubuntu Packages for Kamailio 3.1.3 Broken User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Patch was committed, if the fix is not good, reopen. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=128 You are receiving this message because you have requested it from … [View More]

1 0

[tracker] Comment added: Debian / Ubuntu Packages for Kamailio 3.1.3 Broken
by sip-router 29 Apr '11

29 Apr '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#128 - Debian / Ubuntu Packages for Kamailio 3.1.3 Broken User who did this - Daniel-Constantin Mierla (miconda) ---------- The debs were built through chroot on a x86_64 system and the LIB path was using host architecture instead of target architecture. I did a patch, the 3.1.3 debs will be regenerated when Jon will see the fix. The kamailio31-nightly will be build this night with the fix on it. Thanks.… [View More]

1 0

git:master: debian(k): set version to devel 3.2.0
by Daniel-Constantin Mierla 29 Apr '11

29 Apr '11

Module: sip-router Branch: master Commit: 15471675a7b7e0bd5634b945ee8af4ce7d85b27e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1547167… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 29 17:53:34 2011 +0200 debian(k): set version to devel 3.2.0 --- pkg/kamailio/deb/debian/changelog | 6 ++++++ pkg/kamailio/deb/lenny/changelog | 6 ++++++ pkg/kamailio/deb/… [View More]

1 0

git:3.1: Makefile.defs: moved setting of dirs after target ARCH detection
by Daniel-Constantin Mierla 29 Apr '11

29 Apr '11

Module: sip-router Branch: 3.1 Commit: 9e451170ecb2b6aebf583e6e22960cb65813c69d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e45117… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 29 17:38:29 2011 +0200 Makefile.defs: moved setting of dirs after target ARCH detection - should fix FS#128 - error building deb packages on chroot systems reported by Ali Onur Uyar (… [View More]cherry picked from commit 7bb701b79d769f0c7d79d367521a1f984b35fa64) --- Makefile.defs | 202 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 101 insertions(+), 101 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 7d6d267..d6d8c6d 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -225,107 +225,6 @@ endif # extra CC command line options (e.g -march=athlon-mp) CC_EXTRA_OPTS ?= -LIBDIR ?= -ifeq ($(LIBDIR),) -ARCHBSZ= $(shell echo $(HOST_ARCH) | sed -e 's/.*64.*/64b/') -ifeq ($(ARCHBSZ),64b) - LIBDIR = lib64 -else - LIBDIR = lib -endif -endif - -# dirs -cfg_dir = etc/$(MAIN_NAME)/ -bin_dir = sbin/ -share_dir = share/$(MAIN_NAME)/ -# lib/$(MAIN_NAME)/modules , lib/$(MAIN_NAME)/modules-s, lib/$(MAIN_NAME)/modules-k -modules_dir = $(LIBDIR)/$(MAIN_NAME)/ -lib_dir = $(LIBDIR)/$(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 -endif - -ifeq ($(OS), freebsd) - doc_dir = share/doc/$(MAIN_NAME)/ - man_dir = man/ - data_dir = share/$(MAIN_NAME)/ - LOCALBASE ?= /usr/local -endif - -ifeq ($(OS), openbsd) - doc_dir = share/doc/$(MAIN_NAME)/ - man_dir = man/ - data_dir = share/$(MAIN_NAME)/ - LOCALBASE ?= /usr/local -endif - -ifeq ($(OS), netbsd) - doc_dir = share/doc/$(MAIN_NAME)/ - man_dir = man/ - data_dir = share/$(MAIN_NAME)/ - LOCALBASE ?= /usr/pkg -endif - -ifeq ($(OS), dragonfly) - doc_dir = share/doc/$(MAIN_NAME)/ - man_dir = man/ - data_dir = share/$(MAIN_NAME)/ - LOCALBASE ?= /usr/pkg -endif - -ifeq ($(OS), darwin) - doc_dir = share/doc/$(MAIN_NAME)/ - man_dir = man/ - data_dir = share/$(MAIN_NAME)/ - LOCALBASE ?= /usr/local -endif - -LOCALBASE ?= /usr/local - -# Doxygen directory -doxygen_dir=doc/doxygen - -# install location -PREFIX ?= $(LOCALBASE) -prefix = $(PREFIX) -# install path is $(basedir) $(prefix) -# example: -# creating a bin. archive in /tmp, which unpacks in /usr/local -# basedir=/tmp -# prefix=/usr/local - -BASEDIR ?= $(DESTDIR) -basedir = $(BASEDIR) -# install prefixes for various stuff -cfg_prefix = $(basedir)$(prefix) -bin_prefix = $(basedir)$(prefix) -modules_prefix = $(basedir)$(prefix) -lib_prefix = $(basedir)$(prefix) -doc_prefix = $(basedir)$(prefix) -man_prefix = $(basedir)$(prefix) -ut_prefix = $(basedir)$(prefix) -share_prefix = $(basedir)$(prefix) -data_prefix = $(basedir)$(prefix) - - -# target dirs for various stuff -cfg_target = $(prefix)/$(cfg_dir) -bin_target = $(prefix)/$(bin_dir) -#modules_target = $(prefix)/$(modules_dir) -lib_target = $(prefix)/$(lib_dir) -doc_target = $(prefix)/$(doc_dir) -data_target = $(prefix)/$(data_dir) - - ifeq ($(OS), solaris) #use GNU versions @@ -510,6 +409,107 @@ ARCH:=$(HOST_ARCH) endif $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>) +LIBDIR ?= +ifeq ($(LIBDIR),) +ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/') +ifeq ($(ARCHBSZ),64b) + LIBDIR = lib64 +else + LIBDIR = lib +endif +endif + +# dirs +cfg_dir = etc/$(MAIN_NAME)/ +bin_dir = sbin/ +share_dir = share/$(MAIN_NAME)/ +# lib/$(MAIN_NAME)/modules , lib/$(MAIN_NAME)/modules-s, lib/$(MAIN_NAME)/modules-k +modules_dir = $(LIBDIR)/$(MAIN_NAME)/ +lib_dir = $(LIBDIR)/$(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 +endif + +ifeq ($(OS), freebsd) + doc_dir = share/doc/$(MAIN_NAME)/ + man_dir = man/ + data_dir = share/$(MAIN_NAME)/ + LOCALBASE ?= /usr/local +endif + +ifeq ($(OS), openbsd) + doc_dir = share/doc/$(MAIN_NAME)/ + man_dir = man/ + data_dir = share/$(MAIN_NAME)/ + LOCALBASE ?= /usr/local +endif + +ifeq ($(OS), netbsd) + doc_dir = share/doc/$(MAIN_NAME)/ + man_dir = man/ + data_dir = share/$(MAIN_NAME)/ + LOCALBASE ?= /usr/pkg +endif + +ifeq ($(OS), dragonfly) + doc_dir = share/doc/$(MAIN_NAME)/ + man_dir = man/ + data_dir = share/$(MAIN_NAME)/ + LOCALBASE ?= /usr/pkg +endif + +ifeq ($(OS), darwin) + doc_dir = share/doc/$(MAIN_NAME)/ + man_dir = man/ + data_dir = share/$(MAIN_NAME)/ + LOCALBASE ?= /usr/local +endif + +LOCALBASE ?= /usr/local + +# Doxygen directory +doxygen_dir=doc/doxygen + +# install location +PREFIX ?= $(LOCALBASE) +prefix = $(PREFIX) +# install path is $(basedir) $(prefix) +# example: +# creating a bin. archive in /tmp, which unpacks in /usr/local +# basedir=/tmp +# prefix=/usr/local + +BASEDIR ?= $(DESTDIR) +basedir = $(BASEDIR) +# install prefixes for various stuff +cfg_prefix = $(basedir)$(prefix) +bin_prefix = $(basedir)$(prefix) +modules_prefix = $(basedir)$(prefix) +lib_prefix = $(basedir)$(prefix) +doc_prefix = $(basedir)$(prefix) +man_prefix = $(basedir)$(prefix) +ut_prefix = $(basedir)$(prefix) +share_prefix = $(basedir)$(prefix) +data_prefix = $(basedir)$(prefix) + + +# target dirs for various stuff +cfg_target = $(prefix)/$(cfg_dir) +bin_target = $(prefix)/$(bin_dir) +#modules_target = $(prefix)/$(modules_dir) +lib_target = $(prefix)/$(lib_dir) +doc_target = $(prefix)/$(doc_dir) +data_target = $(prefix)/$(data_dir) + + # compile-time options # # -DSTATS [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2011