diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-08-13 21:40:29 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-08-13 21:40:29 +0200 |
commit | e312afc3440519ea91992b5df74886856ae57555 (patch) | |
tree | 932fff505a520b0a5dd3f82c659c6950defe874c | |
parent | 7be4dc91e91394fc51c8fe2ace14fa716b6e7c34 (diff) | |
download | gnumach-e312afc3440519ea91992b5df74886856ae57555.tar.gz gnumach-e312afc3440519ea91992b5df74886856ae57555.tar.bz2 gnumach-e312afc3440519ea91992b5df74886856ae57555.zip |
Fix building out of source
* configure.ac: Fix patching Makefile.in in $srcdir.
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | i386/i386/trap.c | 2 | ||||
-rw-r--r-- | ipc/mach_port.c | 2 | ||||
-rw-r--r-- | version.m4 | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index df5a1a08..1164b27e 100644 --- a/configure.ac +++ b/configure.ac @@ -217,8 +217,8 @@ dnl config.status dnl ]) AC_CONFIG_COMMANDS_POST([ if "$PATCH" -f < "$srcdir"/config.status.dep.patch > /dev/null 2>&1 || - "$PATCH" -f < "$srcdir"/Makefile.in.dep.patch > /dev/null 2>&1 || - grep "Ugly bootstrap hack to get to-be-generated files created" Makefile.in > /dev/null 2>&1 + ( cd "$srcdir" && "$PATCH" -f < Makefile.in.dep.patch || + grep "Ugly bootstrap hack to get to-be-generated files created" Makefile.in ) > /dev/null 2>&1 then] AC_MSG_NOTICE([Applied a patch to work around a deficiency in] [Automake. See `configure.ac' for details.]) [else] AC_MSG_ERROR([failed to patch using `config.status.dep.patch'.] diff --git a/i386/i386/trap.c b/i386/i386/trap.c index d3f61314..6c2a84bc 100644 --- a/i386/i386/trap.c +++ b/i386/i386/trap.c @@ -65,7 +65,7 @@ #include "debug.h" #if MACH_KDB -boolean_t debug_all_traps_with_kdb = FALSE; +boolean_t debug_all_traps_with_kdb = TRUE; extern struct db_watchpoint *db_watchpoint_list; extern boolean_t db_watchpoints_inserted; diff --git a/ipc/mach_port.c b/ipc/mach_port.c index b30dcd6c..55a13e2b 100644 --- a/ipc/mach_port.c +++ b/ipc/mach_port.c @@ -534,7 +534,7 @@ mach_port_allocate( * KERN_INVALID_NAME The name doesn't denote a right. */ -static volatile boolean_t mach_port_deallocate_debug = FALSE; +static volatile boolean_t mach_port_deallocate_debug = TRUE; kern_return_t mach_port_destroy( @@ -1,4 +1,4 @@ m4_define([AC_PACKAGE_NAME],[GNU Mach]) -m4_define([AC_PACKAGE_VERSION],[1.8+git20180218]) +m4_define([AC_PACKAGE_VERSION],[1.8+git20180728]) m4_define([AC_PACKAGE_BUGREPORT],[bug-hurd@gnu.org]) m4_define([AC_PACKAGE_TARNAME],[gnumach]) |