[ecflow] 10/50: temp. disable auto_ptr as unique_ptr patch has problems

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository ecflow.

commit 63457e830d5ef98ab1d4a53a9a3b4b28528a4192
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Mar 15 06:16:57 2017 +0000

    temp. disable auto_ptr as unique_ptr patch has problems
---
 debian/control        | 3 ++-
 debian/patches/series | 2 +-
 debian/rules          | 6 +++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 8576c72..59bdc67 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 10), dh-buildinfo, cmake,
   chrpath, libmotif-dev,
   libqt5gui5, libqt5widgets5,libqt5core5a,libqt5network5,
-  libboost-test-dev, 
+  libboost-test-dev, libboost-serialization-dev,
+  libboost-date-time-dev, libboost-thread-dev,
   libboost-regex-dev, libboost-python-dev, 
   libboost-program-options-dev, libboost-filesystem-dev,
   python-all-dev,
diff --git a/debian/patches/series b/debian/patches/series
index a716dd4..ee2d8e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 format-security.patch
-auto_ptr.patch
+# auto_ptr.patch
diff --git a/debian/rules b/debian/rules
index debe525..f78d7d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,9 @@ export DH_VERBOSE=1
 %:
 	dh $@ --buildsystem=cmake
 
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -DNO_REGEXP
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
 DESTDIR:=`pwd`/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
@@ -14,4 +17,5 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
                 -DCMAKE_BUILD_TYPE=Release \
 		-DBOOST_INCLUDEDIR=/usr/include \
-		-DBOOSTROOT=$(LIBDIR)
+		-DBOOSTROOT=$(LIBDIR)	\
+		-DCMAKE_C_CFLAGS="${CFLAGS} ${LDFLAGS}" 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ecflow.git