[Pkg-voip-commits] [SCM] reSIProcate branch, debian-experimental, updated. debian-experimental/1.9.0_alpha0-1-12-g5bbc2c7

[Daniel Pocock]

The following commit has been merged in the debian-experimental branch:
commit ad6e67e50c513625040e82fdc91691cc7077b68d
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Thu Jul 18 13:30:58 2013 +0200

    Disable librecon build on non-Linux architectures

diff --git a/debian/control b/debian/control
index 67eb218..504177b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: extra
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Daniel Pocock <daniel at pocock.com.au>
-Build-Depends: debhelper (>= 9.0.0), gperf, libasio-dev (>= 1.2.0), libboost-dev, libc-ares-dev (>= 1.6.0), libdb++-dev, libpopt-dev, libssl-dev (>= 0.9.8), perl, libmysqlclient-dev, libradiusclient-ng-dev, libcppunit-dev, autotools-dev, libpcre3-dev, dpkg-dev (>= 1.16.1~), libxerces-c-dev, libsipxtapi-dev, libsrtp-dev
+Build-Depends: debhelper (>= 9.0.0), gperf, libasio-dev (>= 1.2.0), libboost-dev, libc-ares-dev (>= 1.6.0), libdb++-dev, libpopt-dev, libssl-dev (>= 0.9.8), perl, libmysqlclient-dev, libradiusclient-ng-dev, libcppunit-dev, autotools-dev, libpcre3-dev, dpkg-dev (>= 1.16.1~), libxerces-c-dev, libsipxtapi-dev [linux-any], libsrtp-dev
 Homepage: http://www.resiprocate.org/
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/pkg-voip/resiprocate.git
@@ -35,7 +35,7 @@ Description: reSIProcate SIP stack - development files
  based on the core reSIProcate libraries.
 
 Package: librecon-1.9
-Architecture: any
+Architecture: linux-any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: reSIProcate conversation manager - shared libraries
@@ -54,8 +54,8 @@ Description: reSIProcate conversation manager - shared libraries
  
 Package: librecon-1.9-dev
 Section: libdevel
-Architecture: any
 Depends: librecon-1.9 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Architecture: linux-any
 Description: reSIProcate conversation manager - development files
  reSIProcate is a framework that aims to fully implement the SIP protocol
  in first class C++.  It is intended for use in other applications,
diff --git a/debian/rules b/debian/rules
index a207e56..bc8112a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,17 +24,25 @@ CPPFLAGS += -DDEFAULT_BRIDGE_MAX_IN_OUTPUTS=20
 CXXFLAGS += -fpermissive
 LDFLAGS += -lcares
 
-override_dh_auto_configure:
-	dh_auto_configure -- \
-		--with-ssl \
+CFG_ARGS := --with-ssl \
 		--with-mysql \
 		--with-apps \
 		--enable-ipv6 \
 		--with-radius \
- 	 	--with-c-ares \
-		--with-recon \
+		--with-c-ares \
 		--with-b2bua
 
+# on kfreebsd, sipxtapi is not available and recon can't be built
+# upstream hopes to eliminate the dependency on sipxtapi in a future release
+# so there is no attempt to port sipxtapi
+# on sparc, libsrtp is not available (fails with a bus error during test cases)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+CFG_ARGS += --with-recon
+endif
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(CFG_ARGS)
+
 override_dh_auto_build:
 	dh_auto_build --parallel
 

-- 
reSIProcate