This is an automated email from the git hooks/post-receive script. lamy-guest pushed a commit to branch master in repository odil.
commit a2923478f2c11d35ada3c9d759e98fec74d08557 Author: Julien Lamy <[email protected]> Date: Wed Apr 19 16:51:58 2017 +0200 Fix building --- debian/control | 1 + debian/rules | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index bec31ff..7411c36 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 9), zlib1g-dev, uuid-dev, libboost-dev, + libboost-date-time-dev, libboost-filesystem-dev, libboost-python-dev, liblog4cpp5-dev, diff --git a/debian/rules b/debian/rules index 93efb81..bd3a0ca 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,9 @@ PYTHON2=$(shell pyversions -vr) PYTHON3=$(shell py3versions -vr) ALLPY=$(PYTHON2) $(PYTHON3) +# Required to get the full path to the boost.python library +TRIPLET=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + %: dh $@ --builddirectory=build --parallel --with python2,python3 @@ -19,11 +22,17 @@ override_dh_auto_build-nopy: dh_auto_build mv build build-nopy +foo-py%: + echo /usr/lib/$(TRIPLET)/libboost_python-py$(subst .,,$*).so + # Reconfigure base build for specific Python version and build wrappers override_dh_auto_build-py%: override_dh_auto_build-nopy cp -a build-nopy build dh_auto_configure -- \ - -DBUILD_WRAPPERS=ON -DPython_ADDITIONAL_VERSIONS=$* + -DBUILD_WRAPPERS=ON -DPython_ADDITIONAL_VERSIONS=$* \ + -DPYTHON_EXECUTABLE=/usr/bin/python$* \ + -DBoost_PYTHON_LIBRARY_DEBUG=/usr/lib/$(TRIPLET)/libboost_python-py$(subst .,,$*).so \ + -DBoost_PYTHON_LIBRARY_RELEASE=/usr/lib/$(TRIPLET)/libboost_python-py$(subst .,,$*).so dh_auto_build mv build build-py$* @@ -46,7 +55,7 @@ override_dh_auto_test-arch-py%: override_dh_auto_test-arch: override_dh_auto_test-arch-nopy $(ALLPY:%=override_dh_auto_test-arch-py%) -# Only auto_install base buid: wrappers are installed with *.install files +# Only auto_install base build: wrappers are installed with *.install files override_dh_auto_install-arch: ln -s build-nopy build dh_auto_install @@ -62,6 +71,7 @@ override_dh_install-arch: --override s/libdcm.*-dev/libdcmtk-dev/ \ --override s/libof.*-dev/libdcmtk-dev/ \ --override s/libicuuc.*-dev/libicu-dev/ \ + --override s/libboost_datetime.*-dev/libboost-datetime-dev/ \ --override s/libboost_filesystem.*-dev/libboost-filesystem-dev/ \ --override s/libboost_regex.*-dev/libboost-regex-dev/ \ --override s/libboost_system.*-dev/libboost-system-dev/ \ @@ -69,6 +79,7 @@ override_dh_install-arch: override_dh_clean: dh_clean + find tests -name "*pyc" -delete rm -rf build-nopy $(ALLPY:%=build-py%) doc # These steps are not needed for arch-independent packages -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/odil.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
