Package: fakeroot
Version: 1.18-1
Severity: normal
Tags: patch
Running "debian/rules build" a second time when something failed is
not possible currently because of unconditionnal "mkdir obj-*". Using
"mkdir -p" would only be a partial fix: we would still get configure
re-run for no good.
This patch applies after my multiarch patch in #636192.
>From 1a02affe88c2ae53632593f78175ab8f97569f43 Mon Sep 17 00:00:00 2001
From: Yann Dirson <ydir...@free.fr>
Date: Tue, 13 Sep 2011 23:55:30 +0200
Subject: [PATCH 2/2] Separate configure calls into their own targets.
---
debian/changelog | 4 +++-
debian/rules | 15 ++++++++++-----
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 725ea0b..ca46c56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ fakeroot (1.18-1+multiarch0) unstable; urgency=low
* Multiarch support: set LIB_DIR to $(dpkg-architecture
-qDEB_HOST_MULTIARCH), replace all BIARCH_LIB_DIR and usr/lib dir
from debian/rules with ${LIB_DIR}, remove biarch targets.
+ * Separate configure calls into their own targets to make it possible to
+ debug the build step without removing everything each time.
- -- Yann Dirson <dir...@debian.org> Wed, 14 Sep 2011 00:38:27 +0200
+ -- Yann Dirson <dir...@debian.org> Wed, 14 Sep 2011 00:39:12 +0200
fakeroot (1.18-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 103665d..62273fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,15 +25,20 @@ endif
LIB_DIR=usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-build: build-stamp
-build-stamp:
+obj-sysv/config.status:
$(checkdir)
-
- mkdir obj-sysv obj-tcp
-
+ mkdir obj-sysv
cd obj-sysv && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/${LIB_DIR}/libfakeroot --program-suffix=-sysv $(CONFARGS)
+
+obj-tcp/config.status:
+ $(checkdir)
+ mkdir obj-tcp
cd obj-tcp && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/${LIB_DIR}/libfakeroot --with-ipc=tcp --program-suffix=-tcp $(CONFARGS)
+build: build-stamp
+build-stamp: obj-sysv/config.status obj-tcp/config.status
+ $(checkdir)
+
cd obj-sysv && $(MAKE)
cd obj-tcp && $(MAKE)
--
1.7.5.4
