r2766 - in glibc-package/trunk/debian: . rules.d
Author: aurel32
Date: 2008-01-02 00:17:24 +0000 (Wed, 02 Jan 2008)
New Revision: 2766
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/build.mk
glibc-package/trunk/debian/rules.d/quilt.mk
glibc-package/trunk/debian/rules.d/tarball.mk
Log:
* Support dpkg-buildpackage -j, but only debian/rules is actually run in
parallel.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-01-01 22:08:02 UTC (rev 2765)
+++ glibc-package/trunk/debian/changelog 2008-01-02 00:17:24 UTC (rev 2766)
@@ -5,6 +5,8 @@
Pandit. Closes: #457351.
* patches/series: enable patches/any/cvs-vfscanf.diff. Closes: #453408.
* Remove DEB_BUILD_OPTIONS=parallel=n support, as it is deprecated.
+ * Support dpkg-buildpackage -j, but only debian/rules is actually run in
+ parallel.
[ Clint Adams ]
* debhelper.in/nscd.init: use lsb output functions. Closes: #457661.
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2008-01-01 22:08:02 UTC (rev 2765)
+++ glibc-package/trunk/debian/rules.d/build.mk 2008-01-02 00:17:24 UTC (rev 2766)
@@ -159,3 +159,5 @@
$(call xx,extra_install)
touch $@
+
+.NOTPARALLEL: $(patsubst %,install_%,$(GLIBC_PASSES))
Modified: glibc-package/trunk/debian/rules.d/quilt.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/quilt.mk 2008-01-01 22:08:02 UTC (rev 2765)
+++ glibc-package/trunk/debian/rules.d/quilt.mk 2008-01-02 00:17:24 UTC (rev 2766)
@@ -29,7 +29,7 @@
# These symbolic links are useful when running quilt interactively
# from $(DEB_SRCDIR), or from the patch/unpatch targets.
# Patches specific to a certain architecture are applied first.
-quilt:
+quilt: $(stamp)unpack
@if test -n "$(DEB_SRCDIR)" && test -d $(DEB_SRCDIR); then \
test -L $(DEB_SRCDIR)/debian || ln -s . $(DEB_SRCDIR)/debian; \
test -L $(DEB_SRCDIR)/patches || ln -s $(shell pwd)/debian/patches $(DEB_SRCDIR)/patches; \
Modified: glibc-package/trunk/debian/rules.d/tarball.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/tarball.mk 2008-01-01 22:08:02 UTC (rev 2765)
+++ glibc-package/trunk/debian/rules.d/tarball.mk 2008-01-02 00:17:24 UTC (rev 2766)
@@ -9,7 +9,7 @@
cd $(build-tree) && tar -xjf $(CURDIR)/$(DEB_TARBALL)
touch $@
-$(patsubst %,$(stamp)%,$(GLIBC_OVERLAYS)):
+$(patsubst %,$(stamp)%,$(GLIBC_OVERLAYS)): $(stamp)$(DEB_TARBALL)
cd $(DEB_SRCDIR) && tar -xjf $(CURDIR)/$(notdir $@)
a=`echo $(notdir $@) | sed -e 's/^glibc-//' -e 's/-[^-]*$$//'`; \
d=`echo $(notdir $@) | sed -e 's/\.tar\.bz2$$//'`; \
Reply to: