r19454 - in /desktop/experimental/gtk+2.0/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Apr  9 12:10:57 2009
New Revision: 19454

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19454
Log:
Only pass -j to the main make call, do not parallelize the debian/rules
themselves as it seems to be racy for an unidentified reason which is hard
to reproduce.

Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/rules

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=19454&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Thu Apr  9 12:10:57 2009
@@ -50,6 +50,11 @@
         optimised flavor to install in libgtk2.0-0.
       + Add a debian/libgail18.install.opt which lists files from the
         optimised flavor to install in libgail18.
+
+  [ Loic Minier ]
+  * Only pass -j to the main make call, do not parallelize the debian/rules
+    themselves as it seems to be racy for an unidentified reason which is hard
+    to reproduce.
 
  -- Sebastian Dröge <slomo at debian.org>  Sat, 04 Apr 2009 07:30:56 +0200
 

Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=19454&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Thu Apr  9 12:10:57 2009
@@ -21,7 +21,7 @@
 # -f debian/rules in rules), you need to pass a flag to avoid adding "-jX" when
 # the childs encounters this line
 DEB_BUILD_OPTIONS_PARALLEL ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-MAKEFLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARALLEL))
+PARALLEL_FLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARALLEL))
 
 DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
@@ -207,7 +207,7 @@
 $(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-%
 	dh_testdir
 	LD_LIBRARY_PATH=$(builddir)/gdk-pixbuf/.libs:$(builddir)/gtk/.libs:$(builddir)/gdk/.libs:$(LD_LIBRARY_PATH) \
-		$(MAKE) -C $(builddir)
+		$(MAKE) $(PARALLEL_FLAGS) -C $(builddir)
 	touch $@
 
 build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS))