[Build-common-hackers] Bug#294694: cdbs: simple-patchsys.mk breaks if it can't find patches

[Loïc Minier]

--7JfCtLOvnd9MIVvH
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

severity 294694 important
tags 294694 + patch
thanks

        Hi,

On Fri, Feb 11, 2005, Andres Salomon wrote:
>=20
> If simple-patchsys.mk is included, and debian/patches doesn't exist (or
> is empty), the build just hangs.

 Been bitten by that as well, this is a recent breakage though.

 I'm attaching a patch and bumping the severity, justification:
 - I've found 12 packages with no debian/patches using simple-patchsys
   in debian/rules explicitely,
 - I've found 17 packages with no patches in debian/patches using
   simple-patch in debian/rules explicitely.

 and that's only in pkg-gnome.

   Bye,

--=20
Lo=EFc Minier <lool@dooz.org>
"Neutral President: I have no strong feelings one way or the other."

--7JfCtLOvnd9MIVvH
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="cdbs_0.4.26_fix-warn-for-evil-patches.patch"

diff -urN cdbs-0.4.26.orig/1/rules/simple-patchsys.mk.in cdbs-0.4.26/1/rules/simple-patchsys.mk.in
--- cdbs-0.4.26.orig/1/rules/simple-patchsys.mk.in	2005-02-09 14:48:53.000000000 +0100
+++ cdbs-0.4.26/1/rules/simple-patchsys.mk.in	2005-02-17 11:34:18.394204126 +0100
@@ -45,6 +45,9 @@
 	done ; \
 done)
 
+# if we have any patches, check if some are patching config.{guess,sub,rpath}
+# and print a warning
+ifneq (, $(DEB_PATCHES))
 CDBS_BUILD_DEPENDS    := $(CDBS_BUILD_DEPENDS), patchutils
 evil_patches_that_do_nasty_things := $(shell\
 if lsdiff=`which lsdiff` ; then \
@@ -54,6 +57,7 @@
 ifneq (, $(evil_patches_that_do_nasty_things))
 $(warning ** WARNING **:  The following patches are modifiing auto-updated files.   Please exclude the following files from your patch:  $(evil_patches_that_do_nasty_things))
 endif
+endif
 
 post-patches:: apply-patches
 

--7JfCtLOvnd9MIVvH--