From 02c01078844747a41ce6061d77a167a53dcd5e15 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Tue, 25 Nov 2014 14:12:26 -0500
Subject: [PATCH] launchpad: manually build opendht in packages
Refs #61168
Change-Id: Ibdc33ca64c0a225fab1f71bad56bacc352d5d7fc
---
tools/build-system/launch-build-machine-jenkins.sh | 1 +
.../build-system/launchpad/sflphone-daemon-video/debian/rules | 4 ++--
tools/build-system/launchpad/sflphone-daemon/debian/rules | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/build-system/launch-build-machine-jenkins.sh b/tools/build-system/launch-build-machine-jenkins.sh
index 04634715a3..5f606af6ff 100755
--- a/tools/build-system/launch-build-machine-jenkins.sh
+++ b/tools/build-system/launch-build-machine-jenkins.sh
@@ -280,6 +280,7 @@ END
../bootstrap
# only fetch it, don't build it
make iax
+ make dht
else
pushd libs
#./compile_pjsip.sh #This script should not attempt to compile
diff --git a/tools/build-system/launchpad/sflphone-daemon-video/debian/rules b/tools/build-system/launchpad/sflphone-daemon-video/debian/rules
index e85c980668..d1bba53890 100755
--- a/tools/build-system/launchpad/sflphone-daemon-video/debian/rules
+++ b/tools/build-system/launchpad/sflphone-daemon-video/debian/rules
@@ -20,8 +20,8 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- # build iax with contrib since it is not packaged
- cd contrib && mkdir -p native && cd native && ../bootstrap && make .iax && cd ../..
+ # build iax and opendht with contrib since they are not packaged
+ cd contrib && mkdir -p native && cd native && ../bootstrap && make .iax && make .dht cd ../..
./autogen.sh
./configure --prefix=/usr
touch configure-stamp
diff --git a/tools/build-system/launchpad/sflphone-daemon/debian/rules b/tools/build-system/launchpad/sflphone-daemon/debian/rules
index fc6f77eca2..ff8ac6dcc2 100755
--- a/tools/build-system/launchpad/sflphone-daemon/debian/rules
+++ b/tools/build-system/launchpad/sflphone-daemon/debian/rules
@@ -20,8 +20,8 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- # build iax with contrib since it is not packaged
- cd contrib && mkdir -p native && cd native && ../bootstrap && make .iax && cd ../..
+ # build iax and opendht with contrib since they are not packaged
+ cd contrib && mkdir -p native && cd native && ../bootstrap && make .iax && make .dht && cd ../..
./autogen.sh
./configure --prefix=/usr --disable-video
touch configure-stamp
--
GitLab