[hurd] 01/01: patches/ports_h_loop.patch: Bring 89c2cbb from git to fix glibc build.

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository hurd.

commit 7c22ef7cddc343b6f4d42701274753881bd8f4a3
Author: Samuel Thibault <address@hidden>
Date:   Sat Dec 13 10:42:27 2014 +0000

    patches/ports_h_loop.patch: Bring 89c2cbb from git to fix glibc build.
---
 debian/changelog                  |  7 +++--
 debian/patches/ports_h_loop.patch | 59 +++++++++++++++++++++++++++++++--------
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d7b0a4..23dcfbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-hurd (1:0.5.git20141210-3) UNRELEASED; urgency=medium
+hurd (1:0.5.git20141210-3) unstable; urgency=medium
 
   [ Svante Signell ]
   * patches/exec_filename_fs.patch: Fix gcc warnings.
 
- -- Samuel Thibault <address@hidden>  Fri, 12 Dec 2014 00:57:53 +0000
+  [ Samuel Thibault ]
+  * patches/ports_h_loop.patch: Bring 89c2cbb from git to fix glibc build.
+
+ -- Samuel Thibault <address@hidden>  Fri, 12 Dec 2014 18:42:43 +0000
 
 hurd (1:0.5.git20141210-2) unstable; urgency=medium
 
diff --git a/debian/patches/ports_h_loop.patch 
b/debian/patches/ports_h_loop.patch
index 6729b6e..41fb712 100644
--- a/debian/patches/ports_h_loop.patch
+++ b/debian/patches/ports_h_loop.patch
@@ -1,15 +1,3 @@
-Index: hurd-debian/hurd/hurd_types.defs
-===================================================================
---- hurd-debian.orig/hurd/hurd_types.defs
-+++ hurd-debian/hurd/hurd_types.defs
-@@ -42,7 +42,6 @@ the Free Software Foundation, 675 Mass A
- #undef HURD_DEFAULT_PAYLOAD_TO_PORT
- #endif
- #else
--   import <hurd/ports.h>;
- #define HURD_DEFAULT_PAYLOAD_TO_PORT ports_payload_get_name
- #endif
- 
 Index: hurd-debian/mach-defpager/Makefile
 ===================================================================
 --- hurd-debian.orig/mach-defpager/Makefile
@@ -33,3 +21,50 @@ Index: hurd-debian/boot/Makefile
  all: boot # uxboot
  
  uxboot.o: boot.c
+
+commit 89c2cbb53b8ad14ae9d5d06ec230a696bea4a6ba
+Author: Justus Winter <address@hidden>
+Date:   Fri Dec 12 17:09:07 2014 +0100
+
+    hurd: make the protected payload changes less intrusive
+    
+    The changes to `hurd_types.defs' caused the glibc build to fail.
+    Guard the problematic parts with `HURD_SERVER' similar how it is done
+    in GNU Mach.
+    
+    * Makeconf: Define `HURD_SERVER' when preprocessing the RPC
+    definitions for the server side.
+    * hurd/hurd_types.defs: Guard problematic parts with `HURD_SERVER'.
+
+diff --git a/Makeconf b/Makeconf
+index 5439913..ed2f6d0 100644
+--- a/Makeconf
++++ b/Makeconf
+@@ -546,6 +546,7 @@ MIGCOMFLAGS := -subrprefix __
+ 
+ %.sdefsi %.sdefs.d: %.defs
+       $(CPP) $(CPPFLAGS) $(MIGSFLAGS) $($*-MIGSFLAGS) -DSERVERPREFIX=S_ \
++        -DHURD_SERVER=1 \
+         -MD -MF $*.sdefs.d.new \
+         $< -o $*.sdefsi
+       sed -e 's/[^:]*:/$*Server.c $(mig-sheader-prefix)$*_S.h:/' \
+diff --git a/hurd/hurd_types.defs b/hurd/hurd_types.defs
+index 4c01e63..5fa59f3 100644
+--- a/hurd/hurd_types.defs
++++ b/hurd/hurd_types.defs
+@@ -18,6 +18,7 @@ along with the GNU Hurd; see the file COPYING.  If not, 
write to
+ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+ 
+ 
++#ifdef HURD_SERVER
+ /* The Hurd uses protected payloads to quickly look up the object
+    receiving a message.  Looking up objects is optimized at the cost
+    of having to translate payloads back to port names if the server
+@@ -55,6 +53,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 
02139, USA.  */
+ #ifdef HURD_DEFAULT_PAYLOAD_TO_PORT
+ #define MACH_PAYLOAD_TO_PORT  HURD_DEFAULT_PAYLOAD_TO_PORT
+ #endif
++#endif        /* HURD_SERVER */
+ 
+ #include <mach/std_types.defs>
+ #include <mach/mach_types.defs>

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