[Python-modules-commits] r9259 - in packages/sip4-qt3/trunk/debian (changelog rules)

[shlomme at users.alioth.debian.org]

    Date: Monday, August 3, 2009 @ 21:40:25
  Author: shlomme
Revision: 9259

Fix rules for parallel builds

Modified:
  packages/sip4-qt3/trunk/debian/changelog
  packages/sip4-qt3/trunk/debian/rules

Modified: packages/sip4-qt3/trunk/debian/changelog
===================================================================
--- packages/sip4-qt3/trunk/debian/changelog	2009-08-03 21:09:42 UTC (rev 9258)
+++ packages/sip4-qt3/trunk/debian/changelog	2009-08-03 21:40:25 UTC (rev 9259)
@@ -1,7 +1,9 @@
 sip4-qt3 (4.8.2-1) unstable; urgency=low
 
   * New upstream release
-
+  * debian/rules
+    - Fix rule dependencies to allow parallel builds
+	
  -- Torsten Marek <shlomme at debian.org>  Sat, 01 Aug 2009 17:37:27 +0200
 
 sip4-qt3 (4.8.1-1) unstable; urgency=low

Modified: packages/sip4-qt3/trunk/debian/rules
===================================================================
--- packages/sip4-qt3/trunk/debian/rules	2009-08-03 21:09:42 UTC (rev 9258)
+++ packages/sip4-qt3/trunk/debian/rules	2009-08-03 21:40:25 UTC (rev 9259)
@@ -70,16 +70,13 @@
 	rm -rf *-stamp siputils.pyc $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
 	dh_clean
 
-install-indep: configure install-indep-pre $(PYTHONS:%=install-indep-%)
-	dh_install -i
-
-install-indep-pre:
+install-indep-pre: configure
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i
+	dh_clean -i
 	dh_installdirs -i
 
-install-indep-%:
+install-indep-%: install-indep-pre 
 	mkdir -p debian/python-sip4-dev/usr/include/python$*
 	install -m 644 -o root -g root siplib/sip.h debian/python-sip4-dev/usr/include/python$*/
 	mkdir -p debian/python-sip4-dev/usr/include/python$*_d
@@ -88,21 +85,23 @@
 	mkdir -p debian/python-sip4-dev/usr/lib/python$*/$(call py_sitename,$*)
 	install -m 644 -o root -g root sipdistutils.py debian/python-sip4-dev/usr/lib/python$*/$(call py_sitename,$*)
 
-install-arch-pre:
+install-indep: $(PYTHONS:%=install-indep-%)
+	dh_install -i
+
+install-arch: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k -a
+	dh_prep -a
 	dh_installdirs -a
+	# This is needed to enforce that the install-arch-% rules are
+	# not run in parallel. Both rules install into the same directory,
+	# and therefore might try to access the same files at the same time.
+	# Therefore, instead of depending on the install-arch-% rules,
+	# we invoke them explicitly.
+	for p in $(PYTHONS) ; do \
+		$(MAKE) -f debian/rules install-arch-$$p;\
+	done
 
-install-arch-%: 
-	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
-	$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip4-dbg
-	mkdir -p debian/python-sip4/usr/lib/python$*/$(call py_sitename,$*)/
-	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip4/usr/lib/python$*/$(call py_sitename,$*)/
-	install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip4/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_nd.py
-	install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip4-dbg/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_d.py
-
-install-arch: build install-arch-pre $(PYTHONS:%=install-arch-%)
 	for i in $$(find debian/python-sip4-dbg -name '*.so'); do \
 		b=$$(basename $$i .so); \
 		mv $$i $$(dirname $$i)/$${b}_d.so; \
@@ -112,7 +111,14 @@
 
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
 
-# Build architecture-independent files here.
+install-arch-%:
+	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip4-dbg
+	mkdir -p debian/python-sip4/usr/lib/python$*/$(call py_sitename,$*)/
+	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip4/usr/lib/python$*/$(call py_sitename,$*)/
+	install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip4/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_nd.py
+	install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip4-dbg/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_d.py
+
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
 # in another 'make' thread.