[gnumach] 01/01: patches/git-mach_debug{, 2}.patch: Install mach_debug defs files.

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository gnumach.

commit d23256ebd0ca05357a0eba934fc1b0936f178b21
Author: Samuel Thibault <address@hidden>
Date:   Mon May 26 19:37:04 2014 +0000

    patches/git-mach_debug{,2}.patch: Install mach_debug defs files.
    
    patches/90-fix_headers.patch: Remove, replaced by patch above.
---
 debian/changelog                     |  2 ++
 debian/patches/90-fix_headers.patch  | 20 ----------------
 debian/patches/git-mach_debug.patch  | 38 ++++++++++++++++++++++++++++++
 debian/patches/git-mach_debug2.patch | 45 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  3 ++-
 5 files changed, 87 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a93c5a..581b0d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ gnumach (2:1.4-10) unstable; urgency=medium
     functions mutable.
   * patches/git-memory_object_translatable2.patch: Fix memory object reference
     leak.
+  * patches/git-mach_debug{,2}.patch: Install mach_debug defs files.
+  * patches/90-fix_headers.patch: Remove, replaced by patch above.
 
  -- Samuel Thibault <address@hidden>  Sun, 25 May 2014 20:06:12 +0000
 
diff --git a/debian/patches/90-fix_headers.patch 
b/debian/patches/90-fix_headers.patch
deleted file mode 100644
index 384f0a1..0000000
--- a/debian/patches/90-fix_headers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: gnumach/Makefrag.am
-===================================================================
---- gnumach.orig/Makefrag.am   2014-03-19 23:59:41.000000000 +0000
-+++ gnumach/Makefrag.am        2014-03-20 00:19:32.000000000 +0000
-@@ -414,6 +414,15 @@
- #             mach_debug.defs mach_debug_types.defs mach_debug_types.h \
- #             pc_info.h vm_info.h slab_info.h)
- 
-+include_machdebugdir = $(includedir)/mach_debug
-+include_machdebug_HEADERS = \
-+      include/mach_debug/mach_debug_types.defs \
-+      include/mach_debug/mach_debug_types.h \
-+      include/mach_debug/ipc_info.h \
-+      include/mach_debug/vm_info.h \
-+      include/mach_debug/slab_info.h \
-+      include/mach_debug/hash_info.h
-+
- # Other headers for the distribution.  We don't install these, because the
- # GNU C library has correct versions for users to use.
- # other-sys-headers := types.h time.h reboot.h ioctl.h
diff --git a/debian/patches/git-mach_debug.patch 
b/debian/patches/git-mach_debug.patch
new file mode 100644
index 0000000..883ea06
--- /dev/null
+++ b/debian/patches/git-mach_debug.patch
@@ -0,0 +1,38 @@
+commit d12207fb5a8cef131f262878f98da923af1f8fea
+Author: Justus Winter <address@hidden>
+Date:   Wed Apr 30 13:02:29 2014 +0200
+
+    Install the mach_debug header files
+    
+    The task_set_name RPC introduced in 877a319c changed
+    include/mach/gnumach.defs to include mach_debug/mach_debug_types.defs.
+    Previously though, the debug headers were not installed.
+    
+    * Makefrag.am: Install the mach_debug header files.
+
+diff --git a/Makefrag.am b/Makefrag.am
+index c1387bd..d6dd77f 100644
+--- a/Makefrag.am
++++ b/Makefrag.am
+@@ -419,9 +419,18 @@ include_mach_eXec_HEADERS = \
+       include/mach/exec/elf.h \
+       include/mach/exec/exec.h
+ 
+-# mach-debug-headers:= $(addprefix mach_debug/, hash_info.h ipc_info.h \
+-#             mach_debug.defs mach_debug_types.defs mach_debug_types.h \
+-#             pc_info.h vm_info.h slab_info.h)
++include_mach_debugdir = $(includedir)/mach_debug
++include_mach_debug_HEADERS = \
++      $(addprefix include/mach_debug/, \
++              hash_info.h \
++              ipc_info.h \
++              mach_debug.defs \
++              mach_debug_types.defs \
++              mach_debug_types.h \
++              pc_info.h \
++              vm_info.h \
++              slab_info.h \
++      )
+ 
+ # Other headers for the distribution.  We don't install these, because the
+ # GNU C library has correct versions for users to use.
diff --git a/debian/patches/git-mach_debug2.patch 
b/debian/patches/git-mach_debug2.patch
new file mode 100644
index 0000000..bb5146d
--- /dev/null
+++ b/debian/patches/git-mach_debug2.patch
@@ -0,0 +1,45 @@
+commit 32b5d3ceb7a120b76f10f69afb6acbf453a76bbc
+Author: Justus Winter <address@hidden>
+Date:   Wed Apr 30 13:52:47 2014 +0200
+
+    include: do not guard the host_slab_info RPC with MACH_VM_DEBUG
+    
+    Previously, the definition of the host_slab_info RPC was guarded with
+    MACH_VM_DEBUG, even though it is not at all concerned with the VM
+    subsystem.  Furthermore, there was no "skip" directive for
+    host_slab_info.
+    
+    The function host_slab_info is guarded with MACH_DEBUG.  The server
+    for the RPCs in mach_debug.defs is only used if MACH_DEBUG is
+    defined. There is no need to guard host_slab_info.
+    
+    * include/mach_debug/mach_debug.defs (host_slab_info): Unconditionally
+    include the RPC.
+
+diff --git a/include/mach_debug/mach_debug.defs 
b/include/mach_debug/mach_debug.defs
+index 053c3fe..fb6e3a9 100644
+--- a/include/mach_debug/mach_debug.defs
++++ b/include/mach_debug/mach_debug.defs
+@@ -218,6 +218,12 @@ routine mach_vm_object_pages(
+       out     pages           : vm_page_info_array_t,
+                                       CountInOut, Dealloc);
+ 
++#else /* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */
++skip; /* mach_vm_region_info */
++skip; /* mach_vm_object_info */
++skip; /* mach_vm_object_pages */
++#endif        /* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */
++
+ /*
+  *    Returns information about the memory allocation caches.
+  */
+@@ -225,9 +231,3 @@ routine host_slab_info(
+               host            : host_t;
+       out     info            : cache_info_array_t,
+                                       CountInOut, Dealloc);
+-
+-#else /* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */
+-skip; /* mach_vm_region_info */
+-skip; /* mach_vm_object_info */
+-skip; /* mach_vm_object_pages */
+-#endif        /* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */
diff --git a/debian/patches/series b/debian/patches/series
index 224d227..33f607a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,4 +18,5 @@ git-memory_object_translatable2.patch
 git-notify_translatable.patch
 git-device_translatable.patch
 git-device_translatable2.patch
-90-fix_headers.patch
+git-mach_debug.patch
+git-mach_debug2.patch

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