summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/0001-Makeconf-handle-the-gnumach-protocol.patch6
-rw-r--r--debian/patches/0010-Makeconf-handle-the-task_notify-protocol.patch4
-rw-r--r--debian/patches/external-splitinit.patch24
3 files changed, 17 insertions, 17 deletions
diff --git a/debian/patches/0001-Makeconf-handle-the-gnumach-protocol.patch b/debian/patches/0001-Makeconf-handle-the-gnumach-protocol.patch
index d9bc4ebd..1602299a 100644
--- a/debian/patches/0001-Makeconf-handle-the-gnumach-protocol.patch
+++ b/debian/patches/0001-Makeconf-handle-the-gnumach-protocol.patch
@@ -12,12 +12,12 @@ diff --git a/Makeconf b/Makeconf
index 32eec13..f0d3fe3 100644
--- a/Makeconf
+++ b/Makeconf
-@@ -575,8 +575,9 @@ vpath %.defs $(top_srcdir)/hurd
+@@ -575,7 +575,9 @@ vpath %.defs $(top_srcdir)/hurd
# These we want to find in the libc include directory...
mach_defs_names = bootstrap exc mach mach4 \
mach_host mach_port mach_timer_reply memory_object \
-- memory_object_default notify experimental
-+ memory_object_default notify experimental \
+- memory_object_default notify
++ memory_object_default notify \
+ gnumach \
+
mach_debug_defs_names = mach_debug
diff --git a/debian/patches/0010-Makeconf-handle-the-task_notify-protocol.patch b/debian/patches/0010-Makeconf-handle-the-task_notify-protocol.patch
index 0c0f675a..62020efb 100644
--- a/debian/patches/0010-Makeconf-handle-the-task_notify-protocol.patch
+++ b/debian/patches/0010-Makeconf-handle-the-task_notify-protocol.patch
@@ -12,9 +12,9 @@ diff --git a/Makeconf b/Makeconf
index f0d3fe3..5439913 100644
--- a/Makeconf
+++ b/Makeconf
-@@ -577,7 +577,7 @@ mach_defs_names = bootstrap exc mach mach4 \
+@@ -577,6 +577,7 @@ mach_defs_names = bootstrap exc mach mach4 \
mach_host mach_port mach_timer_reply memory_object \
- memory_object_default notify experimental \
+ memory_object_default notify \
gnumach \
+ task_notify \
diff --git a/debian/patches/external-splitinit.patch b/debian/patches/external-splitinit.patch
index a2ba6c82..c0f05fee 100644
--- a/debian/patches/external-splitinit.patch
+++ b/debian/patches/external-splitinit.patch
@@ -24,18 +24,6 @@ index 0b9eff2..12b56f0 100644
ifeq ($(HAVE_SUN_RPC),yes)
prog-subdirs += nfs nfsd
---- hurd-debian.orig/Makeconf
-+++ hurd-debian/Makeconf
-@@ -548,6 +548,6 @@ vpath %.defs $(top_srcdir)/hurd
- # These we want to find in the libc include directory...
- mach_defs_names = bootstrap exc mach mach4 \
- mach_host mach_port mach_timer_reply memory_object \
-- memory_object_default notify
-+ memory_object_default notify experimental
- mach_debug_defs_names = mach_debug
- device_defs_names = dev_forward device device_reply device_request
-
- mach_defs = $(addsuffix .defs,$(mach_defs_names))
diff --git a/configure.ac b/configure.ac
index 05b959b..68ec159 100644
--- a/configure.ac
@@ -53,3 +41,15 @@ index 05b959b..68ec159 100644
# Check for ncursesw, which is needed for the console-curses client.
hurd_LIB_NCURSESW
+diff --git a/Makeconf b/Makeconf
+index 5439913..1d70e53 100644
+--- a/Makeconf
++++ b/Makeconf
+@@ -582,6 +582,7 @@ mach_defs_names = bootstrap exc mach mach4 \
+ mach_debug_defs_names = mach_debug
+ device_defs_names = dev_forward device device_reply device_request
+
++mach_defs_names += experimental
+ mach_defs = $(addsuffix .defs,$(mach_defs_names))
+ mach_debug_defs = $(addsuffix .defs,$(mach_debug_defs_names))
+ device_defs = $(addsuffix .defs,$(device_defs_names))