r1326 - in glibc-package/trunk/debian: . patches
Author: mbanck
Date: 2006-04-06 09:39:31 +0000 (Thu, 06 Apr 2006)
New Revision: 1326
Added:
glibc-package/trunk/debian/patches/hurd-machrules-make.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Add hurd-machrules-make.diff (fixes build problems with make-3.81 for
Mach interface generation rules) by Roland McGrath (patch from HEAD).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-04-05 22:35:00 UTC (rev 1325)
+++ glibc-package/trunk/debian/changelog 2006-04-06 09:39:31 UTC (rev 1326)
@@ -10,6 +10,10 @@
* debian/debhelper.in/locales.config: /etc/locale.gen was not generated at
initial installation. (Closes: #357523)
+ [ Michael Banck ]
+ * Add hurd-machrules-make.diff (fixes build problems with make-3.81 for
+ Mach interface generation rules) by Roland McGrath (patch from HEAD).
+
-- Denis Barbier <barbier@debian.org> Wed, 5 Apr 2006 22:53:28 +0200
glibc (2.3.6-5) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/hurd-machrules-make.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-machrules-make.diff 2006-04-05 22:35:00 UTC (rev 1325)
+++ glibc-package/trunk/debian/patches/hurd-machrules-make.diff 2006-04-06 09:39:31 UTC (rev 1326)
@@ -0,0 +1,35 @@
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: Fix GNU/Hurd build with make-3.81.
+# DP: Dpatch author: Michael Banck <mbanck@debian.org>
+# DP: Patch author: Roland McGrath
+# DP: Upstream status: Committed to HEAD, BZ #2507
+# DP: Date: 2006-04-04
+
+2006-04-03 Roland McGrath <roland@frob.com>
+
+ [BZ #2507]
+ * mach/Machrules (.udeps-targets): New variable.
+ ($(objpfx)%.udeps static pattern rule): Use it to avoid \ inside
+ quoted string.
+
+===================================================================
+RCS file: /cvs/glibc/libc/mach/Machrules,v
+retrieving revision 1.76
+retrieving revision 1.77
+diff -u -r1.76 -r1.77
+--- libc/mach/Machrules 2006/02/01 22:44:28 1.76
++++ libc/mach/Machrules 2006/04/04 00:22:05 1.77
+@@ -138,10 +138,11 @@
+ # We must use $(CFLAGS) to get -O flags that affect #if's in header files.
+ $(include-%.defs) | \
+ $(CC) $(CFLAGS) $(CPPFLAGS) -M -x c - | \
+- sed -e 's,- *:,$@ $(@:.udeps=.ustamp) $(@:.udeps=.uh) $(@:.udeps=.__h)\
+- $(@:.udeps=_server.c) $(@:.udeps=_server.h):,' \
++ sed -e 's,- *:,$(.udeps-targets):,' \
+ $(sed-remove-objpfx) > $@.new
+ mv -f $@.new $@
++.udeps-targets = $@ $(@:.udeps=.ustamp) $(@:.udeps=.uh) $(@:.udeps=.__h) \
++ $(@:.udeps=_server.c) $(@:.udeps=_server.h)
+ endif
+
+ # Look for the server stub files where they will be written.
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-04-05 22:35:00 UTC (rev 1325)
+++ glibc-package/trunk/debian/patches/series 2006-04-06 09:39:31 UTC (rev 1326)
@@ -140,3 +140,4 @@
argp_h.diff -p1
getcwd_c.diff -p1
siginfo_h.diff -p1
+hurd-machrules-make.diff -p1
Reply to: