[pkg-boost-commits] r15013 - in /boost/trunk/debian: changelog rules

[xnox at users.alioth.debian.org]

Author: xnox
Date: Mon Nov  7 18:45:35 2016
New Revision: 15013

URL: http://svn.debian.org/wsvn/pkg-boost/?sc=1&rev=15013
Log:
Build Boost.Python 2 & 3 bindings in separate builddirs. Closes: #842927

Modified:
    boost/trunk/debian/changelog
    boost/trunk/debian/rules

Modified: boost/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boost/boost/trunk/debian/changelog?rev=15013&op=diff
==============================================================================
--- boost/trunk/debian/changelog	(original)
+++ boost/trunk/debian/changelog	Mon Nov  7 18:45:35 2016
@@ -1,3 +1,9 @@
+boost1.62 (1.62.0+dfsg-3) UNRELEASED; urgency=high
+
+  * Build Boost.Python 2 & 3 bindings in separate builddirs. Closes: #842927
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  Mon, 07 Nov 2016 18:44:37 +0000
+
 boost1.62 (1.62.0+dfsg-2) unstable; urgency=medium
 
   * Limit boost-fiber packages to architectures it is built on.

Modified: boost/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boost/boost/trunk/debian/rules?rev=15013&op=diff
==============================================================================
--- boost/trunk/debian/rules	(original)
+++ boost/trunk/debian/rules	Mon Nov  7 18:45:35 2016
@@ -39,7 +39,7 @@
 	for pyver in $(pyversions); do \
 	 	pyid=$$(echo $$pyver | tr -d .); \
 		echo "Building Boost.Python for python version $$pyver"; \
-	 	$(JAM) --with-python --with-mpi --python-buildid=py$$pyid python=$$pyver; \
+	 	$(JAM) --build-dir=build-$$pyver --user-config=$(CURDIR)/user-config-$$pyver.jam --with-python --with-mpi --python-buildid=py$$pyid python=$$pyver; \
 	 	mv stage/lib/mpi.so stage/lib/mpi-py$$pyid.so || true; \
 	done
 
@@ -63,6 +63,7 @@
 	rm -rf tools/regression/build/bin
 	rm -rf bin.v2 dist
 	rm -rf user-config.jam
+	rm -rf build-* user-config-*.jam
 	rm -rf debian/bjam.1
 	dh_auto_clean
 
@@ -75,7 +76,7 @@
 		--without-python install
 	for pyver in $(pyversions); do \
 		pyid=`echo $$pyver | tr -d .`; \
-		$(JAM) --prefix=$(CURDIR)/debian/tmp/usr \
+		$(JAM) --build-dir=build-$$pyver --user-config=$(CURDIR)/user-config-$$pyver.jam --prefix=$(CURDIR)/debian/tmp/usr \
 			--libdir=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) \
 			install --with-python --with-mpi --python-buildid=py$$pyid python=$$pyver; \
 	done
@@ -342,7 +343,8 @@
 	echo $(TOOLSET_CONFIG) > $@
 	echo "using mpi ;"     >> $@
 	for pyver in $(pyversions); do \
-		echo "using python : $$pyver : /usr ;" >> $@; \
+		cp $@ user-config-$$pyver.jam; \
+		echo "using python : $$pyver : /usr ;" >> user-config-$$pyver.jam; \
 	done
 
 $(filtered_files): % : %.in