[Build-common-hackers] patch to cdbs

Fix 4d876b82 at gmail.com
Sat Oct 13 14:41:29 UTC 2007


If "DEB_BUILDDIR = ..." goes after including autotools.mk, rule "$(DEB_BUILDDIR)/config.status:" expands to "config.status:"
But GNU make cannot find the file "config.status" in current directory, that results in remaking "config.status" twice: before building and
before installation. The second is unnecessary and can even break the installation phase (gcc-4.2).

The following patch effectively fixes that issue:

diff -Naur cdbs-0.4.49.orig/1/class/autotools.mk.in cdbs-0.4.49/1/class/autotools.mk.in
--- cdbs-0.4.49.orig/1/class/autotools.mk.in    2006-10-26 16:50:29.000000000 +0800
+++ cdbs-0.4.49/1/class/autotools.mk.in 2007-10-13 22:25:15.000000000 +0800
@@ -28,6 +28,8 @@
 # no need to pass them to make.
 DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) -C $(DEB_BUILDDIR)

+VPATH = $(DEB_BUILDDIR)
+
 common-configure-arch common-configure-indep:: common-configure-impl
 common-configure-impl:: $(DEB_BUILDDIR)/config.status
 $(DEB_BUILDDIR)/config.status:
diff -Naur cdbs-0.4.49.orig/1/class/qmake.mk.in cdbs-0.4.49/1/class/qmake.mk.in
--- cdbs-0.4.49.orig/1/class/qmake.mk.in        2006-10-26 16:50:29.000000000 +0800
+++ cdbs-0.4.49/1/class/qmake.mk.in     2007-10-13 22:25:29.000000000 +0800
@@ -31,6 +31,8 @@

 QMAKE = qmake

+VPATH = $(DEB_BUILDDIR)
+
 common-configure-arch common-configure-indep:: common-configure-impl
 common-configure-impl:: $(DEB_BUILDDIR)/Makefile
 $(DEB_BUILDDIR)/Makefile:
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/build-common-hackers/attachments/20071013/aad76822/attachment.pgp 


More information about the Build-common-hackers mailing list