[Pkg-virtualbox-devel] Bug#762061: virtualbox-dkms fails to build on standard 3.14.15 kernel

[YOSHINO Yoshihito]

Control: tags -1 + patch

Hi,

> Do you know of the patch you were mentioning ? If it is a single patch, we
> may carry. But looking at the make-dfsg patches, it does not look so.

debian/patches/0003-read.c-record_files-SV-33034-Change-fatal-to-error.patch
in make-dfsg 4.0-8 contains the workaround.

I have refreshed and attached the patch for kbuild.

Regards,
-- 
YOSHINO Yoshihito <yy.y.ja.jp at gmail.com>
-------------- next part --------------
From 53b4a9e66800dde643d3ce7966c5193001e3f12e Mon Sep 17 00:00:00 2001
From: Paul Smith <psmith at gnu.org>
Date: Sun, 20 Oct 2013 12:49:01 -0400
Subject: [PATCH] * read.c (record_files): [SV 33034] Change fatal() to error()

Allows deprecated syntax.  However we don't guarantee this syntax
will continue to be legal in the future.
Change suggested by David Boyce <david.s.boyce at gmail.com>
---
 NEWS   | 19 ++++++++-----------
 read.c |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

Index: kbuild/src/kmk/NEWS
===================================================================
--- kbuild.orig/src/kmk/NEWS
+++ kbuild/src/kmk/NEWS
@@ -114,6 +114,12 @@ http://sv.gnu.org/bugs/index.php?group=m
   after the variable name, to allow for simple, conditional, or appending
   multi-line variable assignment.
 
+* Change the fatal error for mixed explicit and implicit rules, that was
+  introduced in GNU make 3.82, to a non-fatal error.  However, this syntax is
+  still deprecated and may return to being illegal in a future version of GNU
+  make.  Makefiles that rely on this syntax should be fixed.
+  See https://savannah.gnu.org/bugs/?33034
+
 

 Version 3.81
 
@@ -128,8 +134,8 @@ Version 3.81
   any prerequisite that does not exist, even though that prerequisite
   might have caused the target to rebuild.  Starting with the _next_
   release of GNU make, '$?' will contain all prerequisites that caused
-  the target to be considered out of date.  See this Savannah bug:
-  http://savannah.gnu.org/bugs/index.php?func=detailitem&item_id=16051
+  the target to be considered out of date.
+  See http://savannah.gnu.org/bugs/?16051
 
 * WARNING: Backward-incompatibility!
   GNU make now implements a generic "second expansion" feature on the
Index: kbuild/src/kmk/read.c
===================================================================
--- kbuild.orig/src/kmk/read.c
+++ kbuild/src/kmk/read.c
@@ -2743,7 +2743,7 @@ l_next:
       /* Reduce escaped percents.  If there are any unescaped it's an error  */
       name = filenames->name;
       if (find_percent_cached (&name))
-        fatal (flocp, _("mixed implicit and normal rules"));
+        error (flocp, _("*** mixed implicit and normal rules: deprecated syntax"));
     }
 }