[Pkg-voip-commits] [kamailio] 04/09: add new modules to rules and update FLAGS

[Victor Seva Lopez]

This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch master
in repository kamailio.

commit c61308efe89b8d03a2c41c5ea957759eedd39727
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Fri May 29 11:43:05 2015 +0200

    add new modules to rules and update FLAGS
---
 debian/backports/squeeze | 17 +++++++++++++++++
 debian/backports/wheezy  | 11 +++++++++++
 debian/rules             | 25 ++++++++++++++++---------
 3 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/debian/backports/squeeze b/debian/backports/squeeze
index 395c4d4..29b358f 100755
--- a/debian/backports/squeeze
+++ b/debian/backports/squeeze
@@ -69,4 +69,21 @@ sed -i -e '/FREERADIUS/d' debian/rules
 # use old json
 sed -i 's/libjson-c-dev/libjson0-dev/' debian/control
 
+# no kazoo module
+sed -i -e '/librabbitmq-dev/d' -e '/^Package: kamailio-kazoo-modules/,/^$/d' \
+	debian/control
+sed -i -e 's/ kazoo[ ,$]*/ /' debian/rules
+sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ kazoo/' debian/rules
+
+# no cnxcc module
+sed -i -e '/^Package: kamailio-cnxcc-modules/,/^$/d' debian/control
+sed -i -e 's/ cnxcc[ ,$]*/ /' debian/rules
+sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ cnxcc/' debian/rules
+
+# no jansson module
+sed -i -e '/libjansson-dev/d' debian/control
+sed -i -e 's/ jansson[ ,$]*/ /' debian/rules
+sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ jansson/' debian/rules
+sed -i -e 's/ jansson[ ,$]*//' debian/control
+
 exit 0
diff --git a/debian/backports/wheezy b/debian/backports/wheezy
index c32c2db..74e0211 100755
--- a/debian/backports/wheezy
+++ b/debian/backports/wheezy
@@ -29,4 +29,15 @@ sed -i -e '/FREERADIUS/d' debian/rules
 # use old json
 sed -i 's/libjson-c-dev/libjson0-dev/' debian/control
 
+# no kazoo module
+sed -i -e '/librabbitmq-dev/d' -e '/^Package: kamailio-kazoo-modules/,/^$/d' \
+	debian/control
+sed -i -e 's/ kazoo[ ,$]*/ /' debian/rules
+sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ kazoo/' debian/rules
+
+# no cnxcc module
+sed -i -e '/^Package: kamailio-cnxcc-modules/,/^$/d' debian/control
+sed -i -e 's/ cnxcc[ ,$]*/ /' debian/rules
+sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ cnxcc/' debian/rules
+
 exit 0
diff --git a/debian/rules b/debian/rules
index a70b608..f3c9b8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ EXCLUDED_MODULES=
 # extra modules to skip, because they are not compilable now
 # - regardless if they go to the main kamailio package or to some module package,
 # they will be excluded from compile and install of all
-EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy purple mi_xmlrpc
+EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy mi_xmlrpc
 
 # module groups that are packaged in seperate packages
 # (with the name kamailio-$(group_name)-modules)
@@ -40,10 +40,11 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
 			   ldap xml perl utils lua memcached \
 			   snmpstats carrierroute xmpp cpl redis python geoip\
 			   sqlite json ims sctp java \
-			   tls outbound websocket autheph dnssec
+			   purple tls outbound websocket autheph dnssec kazoo cnxcc \
+			   erlang
 
 # module groups to be packaged onto kamailio-extra-modules
-EXTRA_GROUPS=gzcompress uuid ev
+EXTRA_GROUPS=gzcompress uuid ev jansson
 
 # mono not on ia64 or sparc
 ifeq ($(DEB_HOST_ARCH),ia64)
@@ -84,7 +85,7 @@ endef
 define PACKAGE_GRP_INSTALL_template
 	$(foreach grp,$(PACKAGE_GROUPS),\
 		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
-		basedir=$(CURDIR)/debian/kamailio-$(grp)-modules \
+		BASEDIR=$(CURDIR)/debian/kamailio-$(grp)-modules \
 		cfg_prefix=$(CURDIR)/debian/kamailio-$(grp)-modules \
 		doc-dir=share/doc/kamailio-$(grp)-modules quiet=verbose
 		# eliminate duplicate libs
@@ -102,7 +103,7 @@ endef
 define PACKAGE_EXTRA_INSTALL_template
 	$(foreach grp,$(EXTRA_GROUPS),\
 		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
-		basedir=$(CURDIR)/debian/kamailio-extra-modules \
+		BASEDIR=$(CURDIR)/debian/kamailio-extra-modules \
 		cfg_prefix=$(CURDIR)/debian/kamailio-extra-modules \
 		doc-dir=share/doc/kamailio-extra-modules quiet=verbose
 	)
@@ -125,9 +126,14 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 endif
 
 # CFLAGS + CPPFLAGS -> CC_EXTRA_OPTS
+CC_EXTRA_OPTS := $(shell dpkg-buildflags --get CPPFLAGS)
+CC_EXTRA_OPTS += $(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
 # LDFLAGS -> LD_EXTRA_OPTS
-CUSTOM_BUILDFLAGS:=$(shell dpkg-buildflags --export=configure| \
-sed -e 's/" CPPFLAGS="/ /' -e 's/CFLAGS/CC_EXTRA_OPTS/g' -e 's/LDFLAGS/LD_EXTRA_OPTS/g')
+LD_EXTRA_OPTS := $(shell dpkg-buildflags --get LDFLAGS)
+
+# https://wiki.debian.org/ReproducibleBuilds/
+CC_EXTRA_OPTS += -DVERSION_NODATE
 
 configure: configure-stamp
 configure-stamp:
@@ -135,9 +141,10 @@ configure-stamp:
 	# Add here commands to configure the package.
 	$(MAKE) FLAVOUR=kamailio cfg prefix=/usr cfg_prefix=$(CURDIR)/debian/kamailio \
 			cfg_target=/etc/kamailio/ \
-			basedir=$(CURDIR)/debian/kamailio \
+			BASEDIR=$(CURDIR)/debian/kamailio \
 			skip_modules="$(EXCLUDED_MODULES) $(EXTRA_EXCLUDED_MODULES)" \
-			$(CUSTOM_BUILDFLAGS) \
+			CC_EXTRA_OPTS="$(CC_EXTRA_OPTS)" \
+			LD_EXTRA_OPTS="$(LD_EXTRA_OPTS)" \
 			group_include="kstandard" quiet=verbose
 
 	touch configure-stamp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/kamailio.git