[ecflow] 30/50: next try for py3 patch
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Sep 20 15:30:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository ecflow.
commit 384fdf2e9880d2d6779de10bba0fd92947084511
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Jul 15 12:20:31 2017 +0100
next try for py3 patch
---
debian/rules | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index d17ff8f..5f8161b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,13 +16,20 @@ DESTDIR:=`pwd`/debian/tmp/
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
AUTOGENERATED:= ecflow-server.install ecflow-client.install libecflow_view0.install
+PY2:= python2.7
+PY3:=$(shell py3versions -d)
+PY3AB:=$(shell py3versions -d | sed -e 's/python/py/' )
override_dh_auto_clean:
rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
+ dh_auto_clean
+ find . -name '*.pyc' -delete
+ find . -name '*.job*' -delete
# For the moment set ENABLE_SSL=OFF. Enabling it fails tests
override_dh_auto_configure:
+ echo PY3AB = ${PY3AB}
for f in ${AUTOGENERATED} ; do \
sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in > debian/$$f ; \
done
@@ -32,7 +39,14 @@ override_dh_auto_configure:
-DBOOSTROOT=$(LIBDIR) \
-DENABLE_STATIC_BOOST_LIBS=OFF \
-DENABLE_SSL=OFF \
- -DCMAKE_C_CFLAGS="${CFLAGS} ${LDFLAGS}"
+ -DCMAKE_C_CFLAGS="${CFLAGS} ${LDFLAGS}" \
+ -DPYTHON_MIN_VERSION=3.5 \
+ -DBoost_PYTHON_LIBRARY_DEBUG=$(LIBDIR)/libboost_python-${PY3AB}.so \
+ -DBoost_PYTHON_LIBRARY_RELEASE=$(LIBDIR)/libboost_python-${PY3AB}.so
+
+
+# -DPYTHON_LIBRARY=$(LIBDIR)/lib$(PY3)m.so \
+# -DPYTHON_INCLUDE_DIR=/usr/include/$(PY3) \
override_dh_auto_install:
dh_auto_install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ecflow.git
More information about the debian-science-commits
mailing list