[mig] 01/01: patches/git-23e8415: Cherry-pick from upstream to fix gdb build.

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository mig.

commit 1d03217c35ad7575525537ff4999bc0ddf7ee642
Author: Samuel Thibault <address@hidden>
Date:   Mon Sep 7 21:34:23 2015 +0000

    patches/git-23e8415: Cherry-pick from upstream to fix gdb build.
---
 debian/changelog           |  6 ++++++
 debian/patches/git-23e8415 | 39 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 46 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 79f9b12..b240e28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mig (1.5-4) unstable; urgency=medium
+
+  * patches/git-23e8415: Cherry-pick from upstream to fix gdb build.
+
+ -- Samuel Thibault <address@hidden>  Mon, 07 Sep 2015 20:31:25 +0000
+
 mig (1.5-3) unstable; urgency=medium
 
   * Also add the gnu type alias for mig, like gcc.
diff --git a/debian/patches/git-23e8415 b/debian/patches/git-23e8415
new file mode 100644
index 0000000..a05a58c
--- /dev/null
+++ b/debian/patches/git-23e8415
@@ -0,0 +1,39 @@
+commit 23e8415d63e0b1b7641a6aff3646536b7395eb91
+Author: David Michael <address@hidden>
+Date:   Sun May 10 22:30:04 2015 -0400
+
+    Change x_server_routine functions to "static inline" for -std=gnu11
+    
+    * header.c (WriteServerHeader): Replace "extern" with "static".
+    * server.c (WriteEpilog): Remove WriteSubsystemServerRoutine call.
+
+diff --git a/header.c b/header.c
+index 23e5686..3af9746 100644
+--- a/header.c
++++ b/header.c
+@@ -178,7 +178,7 @@ WriteServerHeader(FILE *file, const statement_t *stats)
+      * Include the x_server_routine function so it can be inlined.
+      */
+     fprintf(file, "extern mig_routine_t %s_routines[];\n", ServerDemux);
+-    WriteSubsystemServerRoutine(file, "extern inline");
++    WriteSubsystemServerRoutine(file, "static inline");
+ 
+     WriteEpilog(file, protect);
+ }
+diff --git a/server.c b/server.c
+index 15fc128..a08795b 100644
+--- a/server.c
++++ b/server.c
+@@ -216,12 +216,6 @@ WriteEpilog(FILE *file, const statement_t *stats)
+     fprintf(file, "}\n");
+     fprintf(file, "\n");
+ 
+-    /*
+-     * Then, the <subsystem>_server_routine routine
+-     */
+-    WriteSubsystemServerRoutine(file, "mig_external");
+-    fprintf(file, "\n");
+-
+     /* symtab */
+ 
+     if (GenSymTab) {
diff --git a/debian/patches/series b/debian/patches/series
index e5e4f95..d8f6bde 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 git-R-type-punned.patch
+git-23e8415

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/mig.git