debian/changelog | 8 ++++++--
debian/rules | 3 +--
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 3863dab57783d960781fe57655c2db535f2413e8
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Aug 11 18:16:12 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 42a84a3..9dcc2f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (9.1.6-1) UNRELEASED; urgency=low
+mesa (9.1.6-1) unstable; urgency=low
[ Andreas Boll ]
* New upstream release. (Closes: #717410)
@@ -8,7 +8,7 @@ mesa (9.1.6-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Don't run configure for different builds in parallel.
- -- Andreas Boll <andreas.boll....@gmail.com> Fri, 02 Aug 2013 12:04:47 +0200
+ -- Julien Cristau <jcris...@debian.org> Sun, 11 Aug 2013 18:15:58 +0200
mesa (9.1.4-1) unstable; urgency=low
commit 4082fc253e44eb3f846517ac6a36c3e1b8be3e27
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Jul 9 20:23:15 2013 +0200
Don't run configure for different builds in parallel.
Some files get built in $srcdir, which means they're shared between our
build variants. If variant A tries to use a file while it's being
generated by variant B, things explode.
diff --git a/debian/changelog b/debian/changelog
index 2ef33bb..42a84a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
mesa (9.1.6-1) UNRELEASED; urgency=low
+ [ Andreas Boll ]
* New upstream release. (Closes: #717410)
* Cherry-pick commit 0dbbfa0 (mesa: Fix MESA_PATCH version) from
upstream.
+ [ Julien Cristau ]
+ * Don't run configure for different builds in parallel.
+
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 02 Aug 2013 12:04:47 +0200
mesa (9.1.4-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index fe26287..4c6ad2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
endif
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -182,7 +181,7 @@ $(STAMP)-build-%: configure
--localstatedir=/var --disable-silent-rules \
$(confflags) $(confflags-$*) \
ac_cv_path_LLVM_CONFIG=llvm-config-3.2
- cd $(DEB_BUILD_DIR)/$* && $(MAKE)
+ cd $(DEB_BUILD_DIR)/$* && $(MAKE) -j$(NUMJOBS)
>$@
install: build
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1v8dqs-0005ag...@vasks.debian.org
